2004-07-02 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 1ff1cca758f5d51ec8aaec77f2e64cc7f19b62c4..25e723d94bf9ada9ca51d8d2cff97d2c590a47c3 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -2,7 +2,6 @@
 TEST_PROG=../interpreter/mint
 JITTEST_PROG=../mini/mono
 RUNTIME_ARGS=--config tests-config --optimize=all
-
 #CSC=csc /unsafe
 CSC=mcs --unsafe -nowarn:0162
 
@@ -50,7 +49,6 @@ TEST_CS_SRC=                  \
        pinvoke9.cs             \
        pinvoke10.cs            \
        pinvoke11.cs            \
-       pinvoke12.cs            \
        pinvoke13.cs            \
        pinvoke14.cs            \
        pinvoke15.cs            \
@@ -59,6 +57,8 @@ TEST_CS_SRC=                  \
        pinvoke18.cs            \
        invoke.cs               \
        invoke2.cs              \
+       runtime-invoke.cs               \
+       invoke-string-ctors.cs          \
        reinit.cs               \
        box.cs                  \
        array.cs                \
@@ -144,13 +144,13 @@ TEST_CS_SRC=                      \
        marshal1.cs             \
        marshal2.cs             \
        marshal3.cs             \
-       marshal4.cs             \
        marshal5.cs             \
        marshal6.cs             \
        marshal7.cs             \
        marshal8.cs             \
        marshal9.cs             \
        marshal10.cs            \
+       test-byval-in-struct.cs \
        thread.cs               \
        thread5.cs              \
        thread6.cs              \
@@ -172,6 +172,13 @@ TEST_CS_SRC=                       \
        bug-48015.cs            \
        bug-42136.cs
 
+if X86
+PLATFORM_DISABLED_TESTS=
+endif
+
+DISABLED_TESTS=                        \
+       $(PLATFORM_DISABLED_TESTS)
+
 # These only compile with MS CSC
 TEST_CSC_SRC=                  \
        vararg.cs
@@ -193,13 +200,13 @@ TESTSI_CS=$(TEST_CS_SRC:.cs=.exe)
 TESTSI_IL=$(TEST_IL_SRC:.il=.exe)
 TESTBS=$(BENCHSRC:.cs=.exe)
 
-EXTRA_DIST=test-driver $(TEST_CS_SRC) $(TEST_IL_SRC)
+EXTRA_DIST=test-driver $(TEST_CS_SRC) $(TEST_IL_SRC) $(BENCHSRC)
 
 %.exe: %.il
        ilasm -out:$@ $<
 
 %.exe: %.cs TestDriver.dll
-       $(CSC) -r TestDriver.dll -out:$@ $<
+       $(CSC) -r:TestDriver.dll -out:$@ $<
 
 test:  testjit
 
@@ -211,7 +218,7 @@ test_cs: $(TEST_PROG) $(TESTSI_CS) libtest.la
        passed=0; \
        export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
        for i in $(TESTSI_CS); do       \
-               if $(srcdir)/test-driver $(TEST_PROG) $$i $(RUNTIME_ARGS); \
+               if $(srcdir)/test-driver $(TEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
                then \
                        passed=`expr $${passed} + 1`; \
                else \
@@ -226,7 +233,7 @@ test_il: $(TEST_PROG) $(TESTSI_IL) libtest.la
        passed=0; \
        export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
        for i in $(TESTSI_IL); do       \
-               if $(srcdir)/test-driver $(TEST_PROG) $$i $(RUNTIME_ARGS); \
+               if $(srcdir)/test-driver $(TEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
                then \
                        passed=`expr $${passed} + 1`; \
                else \
@@ -238,7 +245,7 @@ test_il: $(TEST_PROG) $(TESTSI_IL) libtest.la
 
 testb: $(TEST_PROG) $(TESTBS)
        for i in $(TESTBS); do  \
-               $(srcdir)/test-driver $(TEST_PROG) $$i $(RUNTIME_ARGS); \
+               $(srcdir)/test-driver $(TEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS);     \
        done
 
 testjit: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la
@@ -248,7 +255,7 @@ testjit: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la
        export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
        for i in $(TESTSI_CS) $(TESTBS) $(TESTSI_IL); do        \
                rm -f $${i}.so; \
-               if $(srcdir)/test-driver $(JITTEST_PROG) $$i $(RUNTIME_ARGS); \
+               if $(srcdir)/test-driver $(JITTEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
                then \
                        passed=`expr $${passed} + 1`; \
                else \
@@ -258,7 +265,7 @@ testjit: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la
                fi \
        done; \
        echo "$${passed} test(s) passed. $${failed} test(s) failed."; \
-       if [ $$failed > 0 ]; then echo -e "\nFailed tests:\n"; for i in $${failed_tests}; do echo $${i}; done; fi; 
+       if [ $${failed} != 0 ]; then echo -e "\nFailed tests:\n"; for i in $${failed_tests}; do echo $${i}; done; fi; 
 
 testaot: $(TESTSI_CS) $(TESTBS) libtest.la
        @failed=0; \
@@ -268,7 +275,7 @@ testaot: $(TESTSI_CS) $(TESTBS) libtest.la
        for i in $(TESTSI_CS) $(TESTBS); do     \
                rm -f $${i}.so; \
                $(JITTEST_PROG) --aot $${i} > /dev/null; \
-               if $(srcdir)/test-driver $(JITTEST_PROG) $$i $(RUNTIME_ARGS); \
+               if $(srcdir)/test-driver $(JITTEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
                then \
                        passed=`expr $${passed} + 1`; \
                else \
@@ -278,7 +285,7 @@ testaot: $(TESTSI_CS) $(TESTBS) libtest.la
                fi \
        done; \
        echo "$${passed} test(s) passed. $${failed} test(s) failed."; \
-       if [ $$failed > 0 ]; then echo -e "\nFailed tests:\n"; for i in $${failed_tests}; do echo $${i}; done; fi; 
+       if [ $$failed != 0 ]; then echo -e "\nFailed tests:\n"; for i in $${failed_tests}; do echo $${i}; done; fi; 
 
 testinterp: $(TESTSI_CS) $(TESTSI_IL) libtest.la
        @failed=0; \
@@ -286,7 +293,7 @@ testinterp: $(TESTSI_CS) $(TESTSI_IL) libtest.la
        failed_tests="";\
        export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
        for i in $(TESTSI_CS) $(TESTSI_IL); do \
-               if $(srcdir)/test-driver $(TEST_PROG) $$i $(RUNTIME_ARGS); \
+               if $(srcdir)/test-driver $(TEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
                then \
                        passed=`expr $${passed} + 1`; \
                else \
@@ -296,7 +303,7 @@ testinterp: $(TESTSI_CS) $(TESTSI_IL) libtest.la
                fi \
        done; \
        echo "$${passed} test(s) passed. $${failed} test(s) failed."; \
-       if [ $$failed > 0 ]; then echo -e "\nFailed tests:\n"; for i in $${failed_tests}; do echo $${i}; done; fi ;
+       if [ $$failed != 0 ]; then echo -e "\nFailed tests:\n"; for i in $${failed_tests}; do echo $${i}; done; fi ;
 
 testjitspeed: $(JITTEST_PROG) $(TESTBS)
        for i in $(TESTBS); do  \
@@ -313,6 +320,7 @@ INCLUDES = $(GLIB_CFLAGS)
 
 libtest_la_LDFLAGS = -rpath `pwd`
 libtest_la_SOURCES = libtest.c
+libtest_la_LIBADD = $(GLIB_LIBS)
 
-CLEANFILES = $(TESTSI_CS) $(TESTSI_IL) TestDriver.dll
+CLEANFILES = $(TESTSI_CS) $(TESTSI_IL) TestDriver.dll *.stdout