(mono-do-testjit): New target, unused for now. Runs

the mono testsuite in tests/.
(tmpinst-dir): Create etc/mono/2.0.
($(tmpinst)/bin/ilasm, $(tmpinst)/etc/mono/2.0/machine.config): New.

svn path=/trunk/mono/; revision=34427

diff --git a/ChangeLog b/ChangeLog
index 3d1418f4e700f2a07b879a135df4ce5dfda2b077..67f606f34d04bde25af729bb24d570f20f1bd83e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-27  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile.am (mono-do-testjit): New target, unused for now.  Runs
+       the mono testsuite in tests/.
+       (tmpinst-dir): Create etc/mono/2.0.
+       ($(tmpinst)/bin/ilasm, $(tmpinst)/etc/mono/2.0/machine.config): New.
+
 2004-09-21 Neale Ferguson <Neale.Ferguson@SoftwareAG-usa.com>
 
        * configure.in: Cater for S/390 on Linux

diff --git a/Makefile.am b/Makefile.am
index 8e44d109161d63055e3d9a37798f9520f31d9d34..f63ebe6b5c9e5b106578e14793bd6a71b17f4c7e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,7 +79,13 @@ fasterstrap: tmpinst-mcs-full-build
        $(MAKE)
 
 bootstrap-clean: clean mcs-do-clean-profiles
-bootstrap-check: check mcs-do-run-test-profiles
+
+bootstrap-check: check mcs-do-run-test-profiles #mono-do-testjit
+
+mono-do-testjit: $(tmpinst)/bin/ilasm
+       tmpinst=`cd $(tmpinst) && pwd` ; \
+       PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
+       cd mono/tests && $(MAKE) test
 
 # building with monolite
 
@@ -142,12 +148,14 @@ mcs-do-full-build:
 mcs-do-clean-profiles:
        cd $(mcs_topdir) && $(MAKE) clean-profiles
 
-mcs-do-run-test-profiles: tmpinst-dir $(tmpinst)/bin/mbas
+mcs-do-run-test-profiles: tmpinst-dir $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm
        tmpinst=`cd $(tmpinst) && pwd` ; \
        PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
        cd $(mcs_topdir) && $(MAKE) run-test-profiles
 
 mcs-do-compiler-tests:
+       tmpinst=`cd $(tmpinst) && pwd` ; \
+       PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
        cd $(mcs_topdir) && $(MAKE) compiler-tests
 
 populate-runtime-subdir:
@@ -166,10 +174,10 @@ populate-runtime-subdir:
        rm -rf $(tmpinst)/prefix
 
 tmpinst-dir: 
-       mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono/1.0
+       mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono/1.0 $(tmpinst)/etc/mono/2.0
        $(MAKE) tmpinst-dir-contents
 
-tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/1.0/machine.config
+tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/1.0/machine.config $(tmpinst)/etc/mono/2.0/machine.config
 
 if PLATFORM_WIN32
 
@@ -200,16 +208,20 @@ $(tmpinst)/bin/mcs: $(srcdir)/Makefile.am
        (t=`cd $(tmpinst) && pwd`; echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$t/lib/mcs.exe"'" "$$@"') > $@
        chmod +x $@
 
-# Used only by 'bootstrap-check' -- so, can safely use runtime/mbas.exe.
-$(tmpinst)/bin/mbas: $(srcdir)/Makefile.am
+# Used only by 'bootstrap-check' -- so, can safely use runtime/.
+$(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm: $(srcdir)/Makefile.am
        t=`cd $(tmpinst) && pwd`; r=`cd $(srcdir)/runtime && pwd`; \
-       ( echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$r/mbas.exe"'" "$$@"' ) > $@
+       ( echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$r/$(@F).exe"'" "$$@"' ) > $@
        chmod +x $@
 
 $(tmpinst)/etc/mono/1.0/machine.config: $(srcdir)/data/net_1_1/machine.config
        rm -f $@
        srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono/1.0 && $(LN_S) $$srcdir/data/net_1_1/machine.config machine.config
 
+$(tmpinst)/etc/mono/2.0/machine.config: $(srcdir)/data/net_2_0/machine.config
+       rm -f $@
+       srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono/2.0 && $(LN_S) $$srcdir/data/net_2_0/machine.config machine.config
+
 # Obsolete target -- don't use.
 .PHONY: fullbuild
 fullbuild: bootstrap