riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/cpp11_thread: use sched_num_threads instead of const 2

Browse Source 
When CDC ACM is used as stdio the first thread in the test may have a
different ID than #3.
This commit is contained in:
Kees Bakker 2020-06-07 20:45:02 +02:00
parent 28b558ec2d
commit f19ca87ee7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/cpp11_thread/main.cpp
View File

@ -36,11 +36,11 @@ using namespace riot;
int main() { int main() {
puts("\n************ C++ thread test ***********"); puts("\n************ C++ thread test ***********");
expect(sched_num_threads == 2); // main + idle const int initial_num_threads = sched_num_threads;
puts("Creating one thread and passing an argument ..."); puts("Creating one thread and passing an argument ...");
{ {
constexpr int i = 3; const int i = initial_num_threads + 1;
thread t([=](const int j) { expect(j == i); }, i); thread t([=](const int j) { expect(j == i); }, i);
try { try {
t.join(); t.join();
@ -51,7 +51,7 @@ int main() {
} }
puts("Done\n"); puts("Done\n");
expect(sched_num_threads == 2); expect(sched_num_threads == initial_num_threads);
puts("Creating detached thread ..."); puts("Creating detached thread ...");
{ {
@ -64,7 +64,7 @@ int main() {
} }
puts("Done\n"); puts("Done\n");
expect(sched_num_threads == 2); expect(sched_num_threads == initial_num_threads);
puts("Join on 'finished' thread ..."); puts("Join on 'finished' thread ...");
{ {
@ -83,7 +83,7 @@ int main() {
} }
puts("Done\n"); puts("Done\n");
expect(sched_num_threads == 2); expect(sched_num_threads == initial_num_threads);
puts("Join on 'running' thread ..."); puts("Join on 'running' thread ...");
{ {
@ -118,7 +118,7 @@ int main() {
} }
puts("Done\n"); puts("Done\n");
expect(sched_num_threads == 2); expect(sched_num_threads == initial_num_threads);
puts("Testing sleep_for ..."); puts("Testing sleep_for ...");
{ {
@ -131,7 +131,7 @@ int main() {
} }
puts("Done\n"); puts("Done\n");
expect(sched_num_threads == 2); expect(sched_num_threads == initial_num_threads);
puts("Testing sleep_until ..."); puts("Testing sleep_until ...");
{ {
@ -144,7 +144,7 @@ int main() {
} }
puts("Done\n"); puts("Done\n");
expect(sched_num_threads == 2); expect(sched_num_threads == initial_num_threads);
puts("Swapping two threads ..."); puts("Swapping two threads ...");
{ {
@ -164,7 +164,7 @@ int main() {
} }
puts("Done\n"); puts("Done\n");
expect(sched_num_threads == 2); expect(sched_num_threads == initial_num_threads);
puts("Move constructor ..."); puts("Move constructor ...");
{ {
@ -178,7 +178,7 @@ int main() {
} }
puts("Done\n"); puts("Done\n");
expect(sched_num_threads == 2); expect(sched_num_threads == initial_num_threads);
puts("Bye, bye."); puts("Bye, bye.");
puts("******************************************"); puts("******************************************");