diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | mono/mini/ChangeLog | 4 | ||||
| -rw-r--r-- | mono/mini/Makefile.am | 4 | ||||
| -rw-r--r-- | mono/tests/ChangeLog | 4 | ||||
| -rw-r--r-- | mono/tests/Makefile.am | 4 | ||||
| -rw-r--r-- | runtime/Makefile.am | 28 |
6 files changed, 24 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog index e44313bcbd0..c231900f936 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-16 Raja R Harinath <rharinath@novell.com> + + * runtime/Makefile.am (all-local, install-exec, uninstall) + (mcs-do-test-profiles, mcs-do-run-test-profiles, mcs-compileall): + Don't call semdel-wrapper. + 2005-09-06 Chris Toshok <toshok@ximian.com> * data/browscap.ini: Add the ecmascriptversion/w3cdomversion diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 2c97a3c3b83..df034a4638d 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,7 @@ +2005-09-16 Raja R Harinath <rharinath@novell.com> + + * Makefile.am (check-local): Don't invoke semdel-wrapper. + 2005-09-16 Martin Baulig <martin@ximian.com> * exceptions-amd64.c diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index e5656f9ad17..ad0be3f8805 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -370,9 +370,7 @@ stat3: mono bench.exe docu: mini.sgm docbook2txt mini.sgm -check-local: - ok=:; $(MAKE) rcheck || ok=false; \ - $(top_builddir)/runtime/semdel-wrapper || :; $$ok +check-local: rcheck clean-local: rm -f mono a.out gmon.out *.o test.exe diff --git a/mono/tests/ChangeLog b/mono/tests/ChangeLog index 2b2170b05ce..d1fb967dabb 100644 --- a/mono/tests/ChangeLog +++ b/mono/tests/ChangeLog @@ -1,3 +1,7 @@ +2005-09-16 Raja R Harinath <rharinath@novell.com> + + * Makefile.am (check-local): Don't invoke semdel-wrapper. + 2005-09-13 Raja R Harinath <rharinath@novell.com> * Makefile.am (test-type-load): Refer to source files using $(srcdir). diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index 0d140ef4ad8..2cae311eba2 100644 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -1,6 +1,4 @@ -check-local: - ok=:; $(MAKE) test || ok=false; \ - $(top_builddir)/runtime/semdel-wrapper || :; $$ok +check-local: test TEST_PROG = ../interpreter/mint JITTEST_PROG = ../mini/mono diff --git a/runtime/Makefile.am b/runtime/Makefile.am index c807bf32b01..457c7f9fda9 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -19,10 +19,7 @@ SUPPORT_FILES = $(symlinks) mono-wrapper wrapper-config # The write check is to foil 'make distcheck' all-local: $(SUPPORT_FILES) if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi - d=`pwd`; ok=:; \ - ( cd $(mcs_topdir) && \ - $(MAKE) PROFILES='$(build_profiles)' all-profiles ) || ok=false; \ - ./semdel-wrapper || :; $$ok + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' all-profiles if INSTALL_2_0 build_profiles = default net_2_0 @@ -35,10 +32,7 @@ install: install-exec install-data # override automake install-exec: $(SUPPORT_FILES) - d=`pwd`; ok=:; \ - ( cd $(mcs_topdir) && \ - $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles ) || ok=false; \ - ./semdel-wrapper || :; $$ok + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles # override automake install-data: @@ -46,14 +40,11 @@ install-data: # override automake uninstall: - d=`pwd`; ok=:; \ - ( cd $(mcs_topdir) && \ - $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles ) || ok=false; \ - ./semdel-wrapper || :; $$ok + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles ## semdel-wrapper will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-) clean-local: - d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles -./semdel-wrapper -rm -fr $(etctmp) $(tmpinst) .wapi @@ -71,14 +62,11 @@ test_select = ONLY_CENTUM_TESTS=yes endif mcs-do-test-profiles: - d=`pwd`; ok=:; \ - ( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles ) || ok=false; \ - ./semdel-wrapper || :; $$ok + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles mcs-do-run-test-profiles: test-support-files - d=`pwd`; ok=:; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \ - ( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles ) || ok=false; \ - ./semdel-wrapper || :; rm -fr $(tmpinst); $$ok + d=`cd $(tmpinst) && pwd`; PATH=$$d/bin:$$PATH ; export PATH ; \ + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles if PLATFORM_WIN32 cur_dir_cmd = cygpath -w -a . @@ -99,7 +87,7 @@ mcs-compileall: mono-wrapper wrapper-config else \ echo $$i verification failed; ok=false; \ fi; done; done; \ - ./semdel-wrapper || :; $$ok + $$ok check-local: mcs-compileall mcs-do-test-profiles $(MAKE) $(test_select) mcs-do-run-test-profiles |