diff options
author | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-30 10:42:14 +0000 |
---|---|---|
committer | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-30 10:42:14 +0000 |
commit | 7f9318273af20347244cf125a5b8162d1b745685 (patch) | |
tree | e5cab1c1981c16b075e1306e798661ea5cfe202e /gcc/ada | |
parent | 5505dabcc731dd29f891b4cab6feff5f6c9a468c (diff) | |
download | gcc-7f9318273af20347244cf125a5b8162d1b745685.tar.gz |
ada/
* gcc-interface/Make-lang.in (ACATSCMD): New variable.
(check-acats): Use it.
(check_acats_targets): Likewise.
testsuite/
* ada/acats/run_acats: Rename into...
* ada/acats/run_acats.sh: ...this. Only export BASE variable.
* ada/acats/run_all.sh: Remove redundant test.
(target_run): Move around.
(target_gnatchop): Use newly built executable.
(target_gnatmake): Likewise.
Check that the compilation of impbit succeeds.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235678 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada')
-rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/ada/gcc-interface/Make-lang.in | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index cd0ec39fbf8..ebb3bb3a512 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2016-04-30 Eric Botcazou <ebotcazou@adacore.com> + + * gcc-interface/Make-lang.in (ACATSCMD): New variable. + (check-acats): Use it. + (check_acats_targets): Likewise. + 2016-04-28 Eric Botcazou <ebotcazou@adacore.com> PR ada/70786 diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index a8ce6722491..fbfa6c62ea5 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -868,6 +868,7 @@ check-ada: check-acats check-gnat check-ada-subtargets: check-acats-subtargets check-gnat-subtargets ACATSDIR = $(TESTSUITEDIR)/ada/acats +ACATSCMD = run_acats.sh check_acats_numbers0:=1 2 3 4 5 6 7 8 9 check_acats_numbers1:=0 $(check_acats_numbers0) @@ -892,7 +893,7 @@ check-acats: mkdir $(ACATSDIR)-parallel; \ ( testdir=`cd ${srcdir}/${ACATSDIR} && ${PWD_COMMAND}`; \ export testdir; \ - cd $(ACATSDIR) && $(SHELL) $${testdir}/run_acats NONE ) \ + cd $(ACATSDIR) && $(SHELL) $${testdir}/$(ACATSCMD) NONE ) \ || exit 1; \ GCC_RUNTEST_PARALLELIZE_DIR=$$rootme/$(ACATSDIR)-parallel; \ export GCC_RUNTEST_PARALLELIZE_DIR; \ @@ -913,7 +914,7 @@ check-acats: exit 0; \ fi; \ testdir=`cd ${srcdir}/${ACATSDIR} && ${PWD_COMMAND}`; \ - export testdir; cd $(ACATSDIR) && $(SHELL) $${testdir}/run_acats $(CHAPTERS) + export testdir; cd $(ACATSDIR) && $(SHELL) $${testdir}/$(ACATSCMD) $(CHAPTERS) check-acats-subtargets: @echo check-acats @@ -925,7 +926,7 @@ $(check_acats_targets): check-acats%: fi; \ test -d $(ACATSDIR)$* || mkdir -p $(ACATSDIR)$*; \ testdir=`cd ${srcdir}/${ACATSDIR} && ${PWD_COMMAND}`; \ - export testdir; cd $(ACATSDIR)$* && $(SHELL) $${testdir}/run_acats + export testdir; cd $(ACATSDIR)$* && $(SHELL) $${testdir}/$(ACATSCMD) touch $$GCC_RUNTEST_PARALLELIZE_DIR/finished .PHONY: check-acats $(check_acats_targets) |