New test.

[mono.git] / mcs / class / Microsoft.Web.Services / Makefile

diff --git a/mcs/class/Microsoft.Web.Services/Makefile b/mcs/class/Microsoft.Web.Services/Makefile
index 49f99022d8a270d729177fe6b21ab34be0ec0f8d..3eef36e9fc44b5064f43bc56a575b73ebfa151b5 100644 (file)
--- a/mcs/class/Microsoft.Web.Services/Makefile
+++ b/mcs/class/Microsoft.Web.Services/Makefile
@@ -34,15 +34,15 @@ ifndef NO_TEST
 test_lib = $(patsubst %.dll,%_test.dll,$(LIBRARY))
 test_lib2 = $(patsubst %.dll, %_test.dll,$(LIBRARY2))
 test_pdb = $(patsubst %.dll,%.pdb,$(test_lib))
-test_pdb = $(patsubst %.dll,%.pdb,$(test_lib2))
+test_pdb2 = $(patsubst %.dll,%.pdb,$(test_lib2))
 test_sourcefile = $(test_lib).sources
-test_sourcefile2 = Microsoft.Web.Services.dll.2.sources
+test_sourcefile2 = $(test_lib2).sources
 test_response = $(depsdir)/$(test_lib).response
-test_response2 = $(depsdir)/$(test_lib2).response
+test_response2 = $(depsdir)/Microsoft.Web.Services.2_test.dll.response
 test_makefrag = $(depsdir)/$(test_lib).makefrag
-test_makefrag2 = $(depsdir)/$(test_lib2).makefrag
+test_makefrag2 = $(depsdir)/Microsoft.Web.Services.2_test.dll.makefrag
 test_stampfile = $(depsdir)/$(test_lib).stamp
-test_stampfile2 = $(depsdir)/$(test_lib2).stamp
+test_stampfile2 = $(depsdir)/Microsoft.Web.Services.2_test.dll.stamp
 test_flags = /r:$(the_lib) /r:$(topdir)/class/lib/NUnit.Framework.dll $(TEST_MCS_FLAGS)
 test_flags2 = /r:$(the_lib2) /r:$(topdir)/class/lib/NUnit.Framework.dll $(TEST_MCS_FLAGS)
 endif
@@ -60,7 +60,6 @@ install-local: $(the_lib) $(the_lib2)
        $(INSTALL_LIB) $(the_lib) $(DESTDIR)$(prefix)/lib
        $(INSTALL_LIB) $(the_lib2) $(DESTDIR)$(prefix)/lib
        $(INSTALL_LIB) $(def_lib) $(DESTDIR)$(prefix)/lib/Microsoft.Web.Services.dll
-       
 
 clean-local:
        -rm -f $(the_lib) $(makefrag) $(test_lib) \
@@ -77,13 +76,13 @@ ifdef PLATFORM_CHANGE_SEPARATOR_CMD
 endif
 
 ifndef NO_TEST
-test-local: $(the_lib) $(test_lib)
+test-local: $(the_lib) $(test_lib) $(the_lib2) $(test_lib2) 
 
 run-test-local:
        $(TEST_RUNTIME) $(TEST_HARNESS) $(test_lib)
 
 else
-test-local: $(the_lib)
+test-local: $(the_lib) $(the_lib2)
 
 run-test-local:
 endif
@@ -94,30 +93,33 @@ ifdef NO_TEST
 TEST_FILES = 
 else
 TEST_FILES = `cat $(test_sourcefile) |sed -e 's,^\(.\),Test/\1,'`
+TEST_FILES2 = `cat $(test_sourcefile2) |sed -e 's,^\(.\),Test/\1,'`
 endif
 
 dist-local: dist-default
        for f in `cat $(sourcefile)` $(TEST_FILES) ; do \
            dest=`dirname $(distdir)/$$f` ; \
-           $(MKINSTALLDIRS) $$dest && cp $$f $$dest || exit 1 ; \
+           $(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
        done
        for f in `cat $sourcefile2)` $(TEST_FILES) ; do \
            dest=`dirname $(distdir)/$$f` ; \
-           $(MKINSTALLDIRS) $$dest && cp $$f $$dest || exit 1; \
+           $(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1; \
        done
 
 # Fun with dependency tracking
 
 $(the_lib): $(makefrag) $(stampfile) $(response)
-       $(CSCOMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$@ @$(response)
+       $(CSCOMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$(topdir)/class/lib/Microsoft.Web.Services.dll @$(response)
+       mv $(topdir)/class/lib/Microsoft.Web.Services.dll $(topdir)/class/lib/Microsoft.Web.Services.1.dll
 
+# warning: embedded tab in the 'echo touch' line
 $(makefrag): $(sourcefile)
        @echo Creating $@ ...
        @echo "HAVE_MAKEFRAG = yes" >$@.new
        @echo "$(stampfile): \\" >>$@.new
        @cat $< |sed -e 's,\.cs[ \t]*$$,\.cs \\,' >>$@.new
        @cat $@.new |sed -e '$$s, \\$$,,' >$@
-       @$(ECHO_ESCAPE) "\ttouch \$$@" >>$@
+       @echo " touch \$$@" >>$@
        @rm -rf $@.new
 
 ifdef PLATFORM_CHANGE_SEPARATOR_CMD
@@ -134,21 +136,23 @@ $(stampfile):
 endif
 
 $(the_lib2): $(makefrag2) $(stampfile2) $(response2)
-       $(CSCOMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS2) /target:library /out:$@ @$(response2)
+       $(CSCOMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS2) /target:library /out:$(topdir)/class/lib/Microsoft.Web.Services.dll @$(response2)
+       mv $(topdir)/class/lib/Microsoft.Web.Services.dll $(topdir)/class/lib/Microsoft.Web.Services.2.dll
 
+# warning: embedded tab in the 'echo touch' line
 $(makefrag2): $(sourcefile2)
        @echo Creating $@ ...
        @echo "HAVE_MAKEFRAG = yes" >$@.new
        @echo "$(stampfile2): \\" >>$@.new
        @cat $< |sed -e 's,\.cs[ \t]*$$,\.cs \\,' >>$@.new
        @cat $@.new |sed -e '$$s, \\$$,,' >$@
-       @$(ECHO_ESCAPE) "\ttouch \$$@" >>$@
+       @echo " touch \$$@" >>$@
        @rm -rf $@.new
 
-ifdef PLATFORM_CHANGE_SEPERATOR_CMD
+ifdef PLATFORM_CHANGE_SEPARATOR_CMD
 $(response2): $(sourcefile2)
        @echo Creating $@ ...
-       @cat $< |$(PLATFORM_CHANGE_SEPERATOR_CMD) >$@
+       @cat $< |$(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
 endif
 
 -include $(makefrag2)
@@ -175,13 +179,14 @@ else
        @cat $< |sed -e 's,^\(.\),Test/\1,' >$@
 endif
 
+# warning: embedded tab in the 'echo touch' line
 $(test_makefrag): $(test_response)
        @echo Creating $@ ...
        @echo "HAVE_TEST_MAKEFRAG = yes" >$@.new
        @echo "$(test_stampfile): \\" >>$@.new
        @cat $< |sed -e 's,\.cs[ \t]*$$,\.cs \\,' >>$@.new
        @cat $@.new |sed -e '$$s, \\$$,,' >$@
-       @$(ECHO_ESCAPE) "\ttouch \$$@" >>$@
+       @echo " touch \$$@" >>$@
        @rm -rf $@.new
 
 -include $(test_makefrag)
@@ -192,3 +197,33 @@ $(test_stampfile):
        touch $@
 endif
 
+ifndef NO_TEST
+$(test_lib2): $(test_makefrag2) $(the_lib2) $(test_response2) $(test_stampfile2)
+       $(CSCOMPILE) /target:library /out:$@ $(test_flags2) @$(test_response2)
+
+$(test_response2): $(test_sourcefile2)
+       @echo Creating $@ ...
+ifdef PLATFORM_CHANGE_SEPARATOR_CMD
+       @cat $< |sed -e 's,^\(.\),Test/\1,' |$(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
+else
+       @cat $< |sed -e 's,^\(.\),Test/\1,' >$@
+endif
+
+
+# warning: embedded tab in the 'echo touch' line
+$(test_makefrag2): $(test_response2)
+       @echo Creating $@ ...
+       @echo "HAVE_TEST_MAKEFRAG = yes" >$@.new
+       @echo "$(test_stampfile2): \\" >>$@.new
+       @cat $< |sed -e 's,\.cs[ \t]*$$,\.cs \\,' >>$@.new
+       @cat $@.new |sed -e '$$s, \\$$,,' >$@
+       @echo " touch \$$@" >>$@
+       @rm -rf $@.new
+
+-include $(test_makefrag2)
+endif
+#
+ifndef HAVE_TEST_MAKEFRAG
+$(test_stampfile2):
+       touch $@
+endif