Skip to content

Commit

Permalink
[runtime] Include the al script in temporary installation directory
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
grendello committed Jan 5, 2011
1 parent 1b67522 commit 92df045
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion runtime/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
@:

Expand Down

0 comments on commit 92df045

Please sign in to comment.