From 62e9995ecf25df3e1ae34823f47a66b177f9c989 Mon Sep 17 00:00:00 2001 From: Wenlong Mu Date: Wed, 26 Jul 2023 23:45:32 +0800 Subject: [PATCH] Swap the order of the two lines in attach test's .template file (#6227) Fixes incorrect output ordering for the client.attach_test. Removes the client.attach_test from the ignore-failure list in the wrapper script as it now passes for 32-bit and 64-bit Windows. Issue: [#725](https://github.com/DynamoRIO/dynamorio/issues/725) --------- Co-authored-by: Derek Bruening --- suite/runsuite_wrapper.pl | 2 -- suite/tests/client-interface/attach_test.template | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/suite/runsuite_wrapper.pl b/suite/runsuite_wrapper.pl index 75478eafd1c..7d8d8df958e 100755 --- a/suite/runsuite_wrapper.pl +++ b/suite/runsuite_wrapper.pl @@ -224,7 +224,6 @@ 'code_api|client.drwrap-test-detach' => 1, # i#4616 'code_api|client.cbr4' => 1, # i#4792 'code_api|win32.hookerfirst' => 1, # i#4870 - 'code_api|client.attach_test' => 1, # i#725 'code_api|client.winxfer' => 1, # i#4732 # These are from earlier runs on Appveyor: 'code_api|security-common.retnonexisting' => 1, @@ -265,7 +264,6 @@ 'code_api|tool.histogram.offline' => 1, # i#4621 'code_api|tool.drcacheoff.burst_static' => 1, # i#4486 'code_api|tool.drcacheoff.burst_replace' => 1, # i#4486 - 'code_api|client.attach_test' => 1, # i#725 # i#4617: These need build-and-test to build # the 32-bit test app in our separate 64-bit job. 'code_api|win32.mixedmode_late' => 1, # i#4617 diff --git a/suite/tests/client-interface/attach_test.template b/suite/tests/client-interface/attach_test.template index bf85cbc01fa..2870bba300d 100644 --- a/suite/tests/client-interface/attach_test.template +++ b/suite/tests/client-interface/attach_test.template @@ -4,8 +4,13 @@ starting attachee starting #endif thank you for testing attach +#ifdef WINDOWS +event_post_attach +thread init +#else thread init event_post_attach +#endif #ifdef WINDOWS MessageBox closed #endif