diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2011-01-05 14:04:17 +0300 |
|---|---|---|
| committer | Marek Habersack <grendel@twistedcode.net> | 2011-01-05 14:06:30 +0300 |
| commit | 92df0458c09685d8f8dad6f69fe5227e6739a44a (patch) | |
| tree | 2d13110f04ed43ef630665bcd255355c200f3190 /runtime | |
| parent | 1b67522d980504d1020d8b6691268b64ecc0f499 (diff) | |
[runtime] Include the al script in temporary installation directory
This is needed as the 4.0 profile calls 'al' (which is defaults to 4.0) and not
'al2' and if Mono older than 2.8 is installed on the machine, 'al' coming from it
will fail to work with the current Mono and thus some tests will fail.
The commit should fix the 300+ failing tests on the build bots.
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 4af4c83e218..ec9f357096a 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -106,7 +106,7 @@ clean-local: endif BUILD_MCS -TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs $(tmpinst)/bin/dmcs $(tmpinst)/bin/al2 +TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs $(tmpinst)/bin/dmcs $(tmpinst)/bin/al2 $(tmpinst)/bin/al # now a misnomer, but it'll go away soon enough. if ENABLE_NUNIT_TESTS @@ -202,6 +202,12 @@ $(tmpinst)/bin/al2: $(tmpinst)/bin/mono Makefile echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_2_0/al.exe"'" "$$@"' >> $@ ; \ chmod +x $@ +$(tmpinst)/bin/al: $(tmpinst)/bin/mono Makefile + echo '#! /bin/sh' > $@ ; \ + r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \ + echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_4_0/al.exe"'" "$$@"' >> $@ ; \ + chmod +x $@ + test-support-files: $(TEST_SUPPORT_FILES) @: |