Swap the order of the two lines in attach test's .template file (Dyna…

…moRIO#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: [DynamoRIO#725](DynamoRIO#725) --------- Co-authored-by: Derek Bruening <[email protected]>
ivankyluk · Jul 28, 2023 · f9a7703 · f9a7703
1 parent dc03db1
commit f9a7703
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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