summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-07-08 13:28:54 +0200
committerBruno Haible <bruno@clisp.org>2011-07-08 13:28:54 +0200
commit23a17dd5f7f94937da914926725bf3ddab83291f (patch)
treebb103742663cf876e6c8c6e9bfb0e5f10d5a609e
parent65fb20d6b5eb7308276da1a421bfcd253faff703 (diff)
downloadgnulib-23a17dd5f7f94937da914926725bf3ddab83291f.tar.gz
Tests for module 'thread'.
* modules/thread-tests: New file. * tests/test-thread_self.c: New file. * tests/test-thread_create.cc: New file.
-rw-r--r--ChangeLog7
-rw-r--r--modules/thread-tests14
-rw-r--r--tests/test-thread_create.c78
-rw-r--r--tests/test-thread_self.c34
4 files changed, 133 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f64fd62452..59f8bf8aba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-07-08 Bruno Haible <bruno@clisp.org>
+ Tests for module 'thread'.
+ * modules/thread-tests: New file.
+ * tests/test-thread_self.c: New file.
+ * tests/test-thread_create.cc: New file.
+
+2011-07-08 Bruno Haible <bruno@clisp.org>
+
thread: Avoid gcc warnings when using gl_thread_self().
* lib/glthread/thread.h (gl_thread_self): Return a pthread_t, not a
'void *'.
diff --git a/modules/thread-tests b/modules/thread-tests
new file mode 100644
index 0000000000..38608f30e2
--- /dev/null
+++ b/modules/thread-tests
@@ -0,0 +1,14 @@
+Files:
+tests/test-thread_self.c
+tests/test-thread_create.c
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-thread_self test-thread_create
+check_PROGRAMS += test-thread_self test-thread_create
+test_thread_self_LDADD = $(LDADD) @LIBTHREAD@
+test_thread_create_LDADD = $(LDADD) @LIBMULTITHREAD@
diff --git a/tests/test-thread_create.c b/tests/test-thread_create.c
new file mode 100644
index 0000000000..1348c8c3c6
--- /dev/null
+++ b/tests/test-thread_create.c
@@ -0,0 +1,78 @@
+/* Test of gl_thread_create () macro.
+ Copyright (C) 2011 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2011. */
+
+#include <config.h>
+
+#include "glthread/thread.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "macros.h"
+
+static gl_thread_t main_thread_before;
+static gl_thread_t main_thread_after;
+static gl_thread_t worker_thread;
+
+static int dummy;
+static volatile int work_done;
+
+static void *
+worker_thread_func (void *arg)
+{
+ work_done = 1;
+ return &dummy;
+}
+
+int
+main ()
+{
+ main_thread_before = gl_thread_self ();
+
+ if (glthread_create (&worker_thread, worker_thread_func, NULL) == 0)
+ {
+ void *ret;
+
+ /* Check that gl_thread_self () has the same value before than after the
+ first call to gl_thread_create (). */
+ main_thread_after = gl_thread_self ();
+ ASSERT (memcmp (&main_thread_before, &main_thread_after,
+ sizeof (gl_thread_t))
+ == 0);
+
+ gl_thread_join (worker_thread, &ret);
+
+ /* Check the return value of the thread. */
+ ASSERT (ret == &dummy);
+
+ /* Check that worker_thread_func () has finished executing. */
+ ASSERT (work_done);
+
+ return 0;
+ }
+ else
+ {
+#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS
+ fputs ("glthread_create failed\n", stderr);
+ return 1;
+#else
+ fputs ("Skipping test: multithreading not enabled\n", stderr);
+ return 77;
+#endif
+ }
+}
diff --git a/tests/test-thread_self.c b/tests/test-thread_self.c
new file mode 100644
index 0000000000..816ee09680
--- /dev/null
+++ b/tests/test-thread_self.c
@@ -0,0 +1,34 @@
+/* Test of gl_thread_self () macro.
+ Copyright (C) 2011 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2011. */
+
+#include <config.h>
+
+#include "glthread/thread.h"
+
+gl_thread_t main_thread;
+
+int
+main ()
+{
+ /* Check that gl_thread_self () can be used with just $(LIBTHREAD), not
+ $(LIBMULTITHREAD), i.e. in libraries that are multithread-safe but don't
+ create threads themselves. */
+ main_thread = gl_thread_self ();
+
+ return 0;
+}