diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-04-05 20:51:02 +0300 |
|---|---|---|
| committer | Alexis Christoforides <alexis@thenull.net> | 2015-07-20 08:14:28 +0300 |
| commit | e4f44c127ce6ca02c6ec70012f7218c5b3c816e7 (patch) | |
| tree | 34505a253914cf3305993c644494dae305e3fd23 | |
| parent | 102a6818db17470db7a3b83e391fff9bc427ab28 (diff) | |
[runtime] Fix "make distcheck"mono-4.0.3.19
Use $(srcdir) instead of ./ for commands so the path is correct.
Also added missing files to EXTRA_DIST.
| -rwxr-xr-x | mono/mini/Makefile.am.in | 9 | ||||
| -rw-r--r-- | mono/tests/Makefile.am | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index 4dee163e437..44dccdf2771 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -661,15 +661,15 @@ rcheck: mono $(regtests) if NACL_CODEGEN for i in $(regtests); do echo "running test $$i"; $(RUNTIME) $$i --exclude 'NaClDisable' || exit 1; done else - -($(RUNTIME) --regression $(regtests); echo $$? > regressionexitcode.out) | ./emitnunit.pl + -($(RUNTIME) --regression $(regtests); echo $$? > regressionexitcode.out) | $(srcdir)/emitnunit.pl exit $$(cat regressionexitcode.out) endif check-seq-points: mono $(regtests) rm -f TestResults_op_il_seq_point.xml - for i in $(regtests); do ./test_op_il_seq_point.sh $$i || (./test_op_il_seq_point_headerfooter.sh; exit 1) || exit 1; done - for i in $(regtests); do ./test_op_il_seq_point.sh $$i --aot || (./test_op_il_seq_point_headerfooter.sh; exit 1) || exit 1; done - ./test_op_il_seq_point_headerfooter.sh + for i in $(regtests); do $(srcdir)/test_op_il_seq_point.sh $$i || ($(srcdir)/test_op_il_seq_point_headerfooter.sh; exit 1) || exit 1; done + for i in $(regtests); do $(srcdir)/test_op_il_seq_point.sh $$i --aot || ($(srcdir)/test_op_il_seq_point_headerfooter.sh; exit 1) || exit 1; done + $(srcdir)/test_op_il_seq_point_headerfooter.sh gctest: mono gc-test.exe MONO_DEBUG_OPTIONS=clear-nursery-at-gc $(RUNTIME) --regression gc-test.exe @@ -740,6 +740,7 @@ BUILT_SOURCES = version.h $(arch_built) CLEANFILES= $(BUILT_SOURCES) *.exe *.dll EXTRA_DIST = TestDriver.cs ldscript ldscript.mono \ genmdesc.pl \ + emitnunit.pl \ $(test_sources) \ $(x86_sources) cpu-x86.md \ $(amd64_sources) cpu-amd64.md \ diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index 8b0ab538b69..13ecbfb54f6 100644 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -667,7 +667,7 @@ TESTSI_IL=$(TEST_IL_SRC:.il=.exe) TESTBS=$(BENCHSRC:.cs=.exe) STRESS_TESTS=$(STRESS_TESTS_SRC:.cs=.exe) -EXTRA_DIST=test-driver $(TEST_CS_SRC_DIST) $(TEST_IL_SRC) \ +EXTRA_DIST=test-driver test-runner.cs $(TEST_CS_SRC_DIST) $(TEST_IL_SRC) \ $(BENCHSRC) $(STRESS_TESTS_SRC) stress-runner.pl $(PREREQ_IL_SRC) $(PREREQ_CS_SRC) %.exe: %.il |