summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/test.c2
-rw-r--r--common/tests/Makefile.am1
-rw-r--r--common/tests/test-compat.c4
-rw-r--r--common/tests/test-tests.c93
4 files changed, 97 insertions, 3 deletions
diff --git a/common/test.c b/common/test.c
index eb02645..af0ea96 100644
--- a/common/test.c
+++ b/common/test.c
@@ -381,7 +381,7 @@ p11_test_copy_setgid (const char *input)
}
}
if (i == ret) {
- fprintf (stderr, "# no suitable group, skipping test");
+ fprintf (stderr, "# no suitable group, skipping test\n");
return NULL;
}
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index b1a42bd..af4dc15 100644
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -15,6 +15,7 @@ LDADD = \
$(NULL)
CHECK_PROGS = \
+ test-tests \
test-compat \
test-hash \
test-dict \
diff --git a/common/tests/test-compat.c b/common/tests/test-compat.c
index a541235..fe312f8 100644
--- a/common/tests/test-compat.c
+++ b/common/tests/test-compat.c
@@ -89,7 +89,7 @@ int
main (int argc,
char *argv[])
{
- p11_test (test_strndup, "/test/strndup");
- p11_test (test_getauxval, "/test/getauxval");
+ p11_test (test_strndup, "/compat/strndup");
+ p11_test (test_getauxval, "/compat/getauxval");
return p11_test_run (argc, argv);
}
diff --git a/common/tests/test-tests.c b/common/tests/test-tests.c
new file mode 100644
index 0000000..cd48a13
--- /dev/null
+++ b/common/tests/test-tests.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2013 Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the
+ * following disclaimer.
+ * * Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions and
+ * the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ * * The names of contributors to this software may not be
+ * used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Stef Walter <stefw@redhat.com>
+ */
+
+#include "config.h"
+#include "test.h"
+
+#include <stdlib.h>
+
+static void
+test_success (void)
+{
+ /* Yup, nothing */
+}
+
+
+static void
+test_failure (void)
+{
+ if (getenv ("TEST_FAIL")) {
+ p11_test_fail (__FILE__, __LINE__, __FUNCTION__,
+ "Unconditional test failure due to TEST_FAIL environment variable");
+ }
+}
+
+static void
+test_memory (void)
+{
+ char *mem;
+
+ if (getenv ("TEST_FAIL")) {
+ mem = malloc (1);
+ free (mem);
+ *mem = 1;
+ }
+}
+
+
+static void
+test_leak (void)
+{
+ char *mem;
+
+ if (getenv ("TEST_FAIL")) {
+ mem = malloc (1);
+ *mem = 1;
+ }
+}
+
+int
+main (int argc,
+ char *argv[])
+{
+ p11_test (test_success, "/test/success");
+
+ if (getenv ("TEST_FAIL")) {
+ p11_test (test_failure, "/test/failure");
+ p11_test (test_memory, "/test/memory");
+ p11_test (test_leak, "/test/leak");
+ }
+
+ return p11_test_run (argc, argv);
+}