aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-12-25 17:02:56 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-12-25 17:02:56 +0200
commit6a5ec36aeba126feecf7f2d85daad90fbc0e4ec9 (patch)
tree60cf639774aa50354bbdb8bfcfbf52eb1b015395
parent10acaffde7148409585b7a1c9a5f954f95e0d3aa (diff)
downloadmeson-6a5ec36aeba126feecf7f2d85daad90fbc0e4ec9.zip
meson-6a5ec36aeba126feecf7f2d85daad90fbc0e4ec9.tar.gz
meson-6a5ec36aeba126feecf7f2d85daad90fbc0e4ec9.tar.bz2
Made thread test work on Windows.
-rw-r--r--test cases/common/102 threads/threadprog.cpp29
1 files changed, 29 insertions, 0 deletions
diff --git a/test cases/common/102 threads/threadprog.cpp b/test cases/common/102 threads/threadprog.cpp
index 9d140b3..6fd747f 100644
--- a/test cases/common/102 threads/threadprog.cpp
+++ b/test cases/common/102 threads/threadprog.cpp
@@ -1,3 +1,30 @@
+/* On Windows not all versions of VS support C++11 and
+ * some (most?) versions of mingw don't support std::thread,
+ * even though they do support c++11. Since we only care about
+ * threads working, do the test with raw win threads.
+ */
+
+#if defined _WIN32
+
+#include<windows.h>
+#include<stdio.h>
+
+DWORD WINAPI thread_func(LPVOID) {
+ printf("Printing from a thread.\n");
+ return 0;
+}
+
+int main(int, char**) {
+ printf("Starting thread.\n");
+ HANDLE th;
+ DWORD id;
+ th = CreateThread(NULL, 0, thread_func, NULL, 0, &id);
+ WaitForSingleObject(th, INFINITE);
+ printf("Stopped thread.\n");
+ return 0;
+}
+#else
+
#include<thread>
#include<cstdio>
@@ -12,3 +39,5 @@ int main(int, char**) {
printf("Stopped thread.\n");
return 0;
}
+
+#endif