diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -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 | 33 |
6 files changed, 38 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index 0cd05d0a8bf..448e50e4e7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,9 @@ (noinst_SCRIPTS): Add semdel-wrapper. (MYDISTFILES, distdir): Use automake variable to get the list of files to distribute. + (all-local, install-exec, uninstall): Call semdel-wrapper. + (mcs-do-test-profiles, mcs-do-run-test-profiles, mcs-compileall): + Likewise. 2005-06-27 Geoff Norton <gnorton@customerdna.com> diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 55f6992477d..1b6b4232f42 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,7 @@ +2005-07-01 Raja R Harinath <rharinath@novell.com> + + * Makefile.am (check-local): Call semdel-wrapper. + 2005-06-29 Zoltan Varga <vargaz@freemail.hu> * mini-x86.c: Revert the last change as it seems to break the build.. diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index ff9659ad445..12ffa219cef 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -343,7 +343,9 @@ stat3: mono bench.exe docu: mini.sgm docbook2txt mini.sgm -check-local: rcheck +check-local: + ok=:; $(MAKE) rcheck || ok=false; \ + $(top_builddir)/runtime/semdel-wrapper || :; $$ok clean-local: rm -f mono a.out gmon.out *.o test.exe diff --git a/mono/tests/ChangeLog b/mono/tests/ChangeLog index b83435ba032..a9b2910ca98 100644 --- a/mono/tests/ChangeLog +++ b/mono/tests/ChangeLog @@ -1,3 +1,7 @@ +2005-07-01 Raja R Harinath <rharinath@novell.com> + + * Makefile.am (check-local): Call semdel-wrapper. + 2005-06-28 Zoltan Varga <vargaz@freemail.hu> * Makefile.am appdomain3.cs: Remove appdomain3 test, since it is a duplicate of appdomain-unload. diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index aadfed3824e..d14b7a042a2 100644 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -1,4 +1,6 @@ -check-local: test +check-local: + ok=:; $(MAKE) test || ok=false; \ + $(top_builddir)/runtime/semdel-wrapper || :; $$ok TEST_PROG = ../interpreter/mint JITTEST_PROG = ../mini/mono diff --git a/runtime/Makefile.am b/runtime/Makefile.am index ec7e4783030..c807bf32b01 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -19,7 +19,10 @@ 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`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' all-profiles + d=`pwd`; ok=:; \ + ( cd $(mcs_topdir) && \ + $(MAKE) PROFILES='$(build_profiles)' all-profiles ) || ok=false; \ + ./semdel-wrapper || :; $$ok if INSTALL_2_0 build_profiles = default net_2_0 @@ -32,8 +35,10 @@ install: install-exec install-data # override automake install-exec: $(SUPPORT_FILES) - d=`pwd`; \ - cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles + d=`pwd`; ok=:; \ + ( cd $(mcs_topdir) && \ + $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles ) || ok=false; \ + ./semdel-wrapper || :; $$ok # override automake install-data: @@ -41,8 +46,10 @@ install-data: # override automake uninstall: - d=`pwd`; \ - cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles + d=`pwd`; ok=:; \ + ( cd $(mcs_topdir) && \ + $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles ) || ok=false; \ + ./semdel-wrapper || :; $$ok ## semdel-wrapper will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-) clean-local: @@ -64,12 +71,14 @@ test_select = ONLY_CENTUM_TESTS=yes endif mcs-do-test-profiles: - d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles + d=`pwd`; ok=:; \ + ( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles ) || ok=false; \ + ./semdel-wrapper || :; $$ok mcs-do-run-test-profiles: test-support-files - d=`pwd`; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \ - ( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \ - rm -fr $(tmpinst); $$ret + 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 if PLATFORM_WIN32 cur_dir_cmd = cygpath -w -a . @@ -81,16 +90,16 @@ endif # Use --compile-all as a poor man's PEVerify to detect invalid IL mcs-compileall: mono-wrapper wrapper-config - save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ret=:; \ + save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \ for profile in $(build_profiles); do \ MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; export MONO_PATH; \ for i in $(mcs_topdir)/class/lib/$$profile/*.dll $(mcs_topdir)/class/lib/$$profile/*.exe $(mcs_topdir)/class/Microsoft.VisualBasic/fixup/$$profile/*.dll; do \ if ./mono-wrapper --compile-all $$i; then \ echo $$i verified OK; \ else \ - echo $$i verification failed; ret=false; \ + echo $$i verification failed; ok=false; \ fi; done; done; \ - $$ret + ./semdel-wrapper || :; $$ok check-local: mcs-compileall mcs-do-test-profiles $(MAKE) $(test_select) mcs-do-run-test-profiles |