diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-11-02 19:23:18 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-11-03 21:05:20 +0200 |
| commit | 9d1e747d17c75a288d0b58a8ac973dab1712afbf (patch) | |
| tree | 15dedfab78da4ad20ce272e65d7a7876ae717181 /test cases/common/98 threads | |
| parent | ff50f724bbf49739abbee9cbb4c8e6200849738f (diff) | |
| download | meson-9d1e747d17c75a288d0b58a8ac973dab1712afbf.tar.gz | |
Condense test directory names again.
Diffstat (limited to 'test cases/common/98 threads')
| -rw-r--r-- | test cases/common/98 threads/meson.build | 16 | ||||
| -rw-r--r-- | test cases/common/98 threads/threadprog.c | 40 | ||||
| -rw-r--r-- | test cases/common/98 threads/threadprog.cpp | 43 |
3 files changed, 0 insertions, 99 deletions
diff --git a/test cases/common/98 threads/meson.build b/test cases/common/98 threads/meson.build deleted file mode 100644 index 1fbb15ac7..000000000 --- a/test cases/common/98 threads/meson.build +++ /dev/null @@ -1,16 +0,0 @@ -project('threads', 'cpp', 'c', - default_options : ['cpp_std=c++11']) - -threaddep = dependency('threads') - -test('cppthreadtest', - executable('cppthreadprog', 'threadprog.cpp', - dependencies : threaddep - ) -) - -test('cthreadtest', - executable('cthreadprog', 'threadprog.c', - dependencies : threaddep - ) -) diff --git a/test cases/common/98 threads/threadprog.c b/test cases/common/98 threads/threadprog.c deleted file mode 100644 index 7bfb7c444..000000000 --- a/test cases/common/98 threads/threadprog.c +++ /dev/null @@ -1,40 +0,0 @@ -#if defined _WIN32 - -#include<windows.h> -#include<stdio.h> - -DWORD WINAPI thread_func(void) { - printf("Printing from a thread.\n"); - return 0; -} - -int main(void) { - DWORD id; - HANDLE th; - printf("Starting thread.\n"); - th = CreateThread(NULL, 0, thread_func, NULL, 0, &id); - WaitForSingleObject(th, INFINITE); - printf("Stopped thread.\n"); - return 0; -} -#else - -#include<pthread.h> -#include<stdio.h> - -void* main_func(void) { - printf("Printing from a thread.\n"); - return NULL; -} - -int main(void) { - pthread_t thread; - int rc; - printf("Starting thread.\n"); - rc = pthread_create(&thread, NULL, main_func, NULL); - rc = pthread_join(thread, NULL); - printf("Stopped thread.\n"); - return rc; -} - -#endif diff --git a/test cases/common/98 threads/threadprog.cpp b/test cases/common/98 threads/threadprog.cpp deleted file mode 100644 index 3c69dc3a8..000000000 --- a/test cases/common/98 threads/threadprog.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* 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(void) { - 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> - -void main_func(void) { - printf("Printing from a thread.\n"); -} - -int main(void) { - printf("Starting thread.\n"); - std::thread th(main_func); - th.join(); - printf("Stopped thread.\n"); - return 0; -} - -#endif |
