Merge pull request #1081 from rneatherway/bug17537

[mono.git] / mono / tests / Makefile.am

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 7e1a953d9fa6143a665f09ca5d487ddaa98c5971..9c6ebbaa1245c658e8e06f5fa9d0907e9f7fc85e 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -403,7 +403,8 @@ BASE_TEST_CS_SRC=           \
        unload-appdomain-on-shutdown.cs \
        block_guard_restore_aligment_on_exit.cs \
        thread_static_gc_layout.cs \
-       sleep.cs
+       sleep.cs \
+       bug-17537.cs
 
 TEST_CS_SRC_DIST=      \
        $(BASE_TEST_CS_SRC)     \
@@ -1190,6 +1191,14 @@ bug-382986-lib.dll: bug-382986-lib.cs
 bug-382986.exe: bug-382986.cs bug-382986-lib.dll
        $(MCS) -out:$@ -r:bug-382986-lib.dll $(srcdir)/bug-382986.cs
 
+EXTRA_DIST += bug-17537-helper.cs
+bug-17537-helper.exe: bug-17537-helper.cs
+       $(MCS) -out:$@ $(srcdir)/bug-17537-helper.cs
+       chmod -x $@
+
+bug-17537.exe: bug-17537.cs bug-17537-helper.exe
+       $(MCS) -out:$@ $(srcdir)/bug-17537.cs
+
 EXTRA_DIST += coreclr-security.cs
 
 coreclr-security.exe : coreclr-security.cs
@@ -1301,12 +1310,8 @@ patch-libtool:
 if NACL_CODEGEN
 test-process-exit:
 else
-EXTRA_DIST += bug-438454.cs bug-438454.exe.stdout.expected threadpool-in-processexit.cs threadpool-in-processexit.exe.stdout.expected
+EXTRA_DIST += threadpool-in-processexit.cs threadpool-in-processexit.exe.stdout.expected
 test-process-exit:
-       @$(MCS) $(srcdir)/bug-438454.cs -out:bug-438454.exe
-       @echo "Testing bug-438454.exe..."
-       @$(RUNTIME) bug-438454.exe > bug-438454.exe.stdout
-       @diff -w bug-438454.exe.stdout $(srcdir)/bug-438454.exe.stdout.expected
        @$(MCS) $(srcdir)/threadpool-in-processexit.cs -out:threadpool-in-processexit.exe
        @echo "Testing threadpool-in-processexit.exe..."
        @$(RUNTIME) threadpool-in-processexit.exe > threadpool-in-processexit.exe.stdout