Commit f73036c1 by Eric Botcazou Committed by Eric Botcazou

Make-lang.in (ACATSCMD): New variable.

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.

From-SVN: r235678
parent ace08cb8
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> 2016-04-28 Eric Botcazou <ebotcazou@adacore.com>
PR ada/70786 PR ada/70786
......
...@@ -868,6 +868,7 @@ check-ada: check-acats check-gnat ...@@ -868,6 +868,7 @@ check-ada: check-acats check-gnat
check-ada-subtargets: check-acats-subtargets check-gnat-subtargets check-ada-subtargets: check-acats-subtargets check-gnat-subtargets
ACATSDIR = $(TESTSUITEDIR)/ada/acats ACATSDIR = $(TESTSUITEDIR)/ada/acats
ACATSCMD = run_acats.sh
check_acats_numbers0:=1 2 3 4 5 6 7 8 9 check_acats_numbers0:=1 2 3 4 5 6 7 8 9
check_acats_numbers1:=0 $(check_acats_numbers0) check_acats_numbers1:=0 $(check_acats_numbers0)
...@@ -892,7 +893,7 @@ check-acats: ...@@ -892,7 +893,7 @@ check-acats:
mkdir $(ACATSDIR)-parallel; \ mkdir $(ACATSDIR)-parallel; \
( testdir=`cd ${srcdir}/${ACATSDIR} && ${PWD_COMMAND}`; \ ( testdir=`cd ${srcdir}/${ACATSDIR} && ${PWD_COMMAND}`; \
export testdir; \ export testdir; \
cd $(ACATSDIR) && $(SHELL) $${testdir}/run_acats NONE ) \ cd $(ACATSDIR) && $(SHELL) $${testdir}/$(ACATSCMD) NONE ) \
|| exit 1; \ || exit 1; \
GCC_RUNTEST_PARALLELIZE_DIR=$$rootme/$(ACATSDIR)-parallel; \ GCC_RUNTEST_PARALLELIZE_DIR=$$rootme/$(ACATSDIR)-parallel; \
export GCC_RUNTEST_PARALLELIZE_DIR; \ export GCC_RUNTEST_PARALLELIZE_DIR; \
...@@ -913,7 +914,7 @@ check-acats: ...@@ -913,7 +914,7 @@ check-acats:
exit 0; \ exit 0; \
fi; \ fi; \
testdir=`cd ${srcdir}/${ACATSDIR} && ${PWD_COMMAND}`; \ 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: check-acats-subtargets:
@echo check-acats @echo check-acats
...@@ -925,7 +926,7 @@ $(check_acats_targets): check-acats%: ...@@ -925,7 +926,7 @@ $(check_acats_targets): check-acats%:
fi; \ fi; \
test -d $(ACATSDIR)$* || mkdir -p $(ACATSDIR)$*; \ test -d $(ACATSDIR)$* || mkdir -p $(ACATSDIR)$*; \
testdir=`cd ${srcdir}/${ACATSDIR} && ${PWD_COMMAND}`; \ 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 touch $$GCC_RUNTEST_PARALLELIZE_DIR/finished
.PHONY: check-acats $(check_acats_targets) .PHONY: check-acats $(check_acats_targets)
......
2016-04-30 Eric Botcazou <ebotcazou@adacore.com>
* 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.
2016-04-30 Oleg Endo <olegendo@gcc.gnu.org> 2016-04-30 Oleg Endo <olegendo@gcc.gnu.org>
* g++.old-deja/g++.jason/thunk3.C: Remove SH5 checks. * g++.old-deja/g++.jason/thunk3.C: Remove SH5 checks.
......
...@@ -47,9 +47,7 @@ if [ ! -f $BASE/gnatmake ]; then ...@@ -47,9 +47,7 @@ if [ ! -f $BASE/gnatmake ]; then
exit 1 exit 1
fi fi
GCC_DRIVER="$BASE/xgcc" export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH BASE LD_LIBRARY_PATH
GCC="$BASE/xgcc -B$BASE/"
export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_DRIVER GCC LD_LIBRARY_PATH
echo '#!/bin/sh' > host_gnatchop echo '#!/bin/sh' > host_gnatchop
echo PATH=`dirname $host_gnatchop`:'$PATH' >> host_gnatchop echo PATH=`dirname $host_gnatchop`:'$PATH' >> host_gnatchop
......
...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
gccflags="-O2" gccflags="-O2"
gnatflags="-gnatws" gnatflags="-gnatws"
target_run () {
eval $EXPECT -f $testdir/run_test.exp $*
}
# End of customization section. # End of customization section.
# Perform arithmetic evaluation on the ARGs, and store the result in the # Perform arithmetic evaluation on the ARGs, and store the result in the
...@@ -52,29 +48,30 @@ log () { ...@@ -52,29 +48,30 @@ log () {
dir=`${PWDCMD-pwd}` dir=`${PWDCMD-pwd}`
if [ "$testdir" = "" ]; then
echo You must use make check or make check-ada
exit 1
fi
if [ "$dir" = "$testdir" ]; then if [ "$dir" = "$testdir" ]; then
echo "error: srcdir must be different than objdir, exiting." echo "error: srcdir must be different than objdir, exiting."
exit 1 exit 1
fi fi
GCC="$BASE/xgcc -B$BASE/"
target_gnatchop () { target_gnatchop () {
gnatchop --GCC="$GCC_DRIVER" $* $BASE/gnatchop --GCC="$BASE/xgcc" $*
} }
target_gnatmake () { target_gnatmake () {
echo gnatmake --GCC=\"$GCC\" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC=\"$GCC\" echo $BASE/gnatmake --GNATBIND=$BASE/gnatbind --GNATLINK=$BASE/gnatlink --GCC="$GCC" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC="$GCC"
gnatmake --GCC="$GCC" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC="$GCC" $BASE/gnatmake --GNATBIND=$BASE/gnatbind --GNATLINK=$BASE/gnatlink --GCC="$GCC" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC="$GCC"
} }
target_gcc () { target_gcc () {
$GCC $gccflags $* $GCC $gccflags $*
} }
target_run () {
eval $EXPECT -f $testdir/run_test.exp $*
}
clean_dir () { clean_dir () {
rm -f "$binmain" *.o *.ali > /dev/null 2>&1 rm -f "$binmain" *.o *.ali > /dev/null 2>&1
} }
...@@ -128,6 +125,10 @@ cp $testdir/support/*.ada $testdir/support/*.a $testdir/support/*.tst $dir/suppo ...@@ -128,6 +125,10 @@ cp $testdir/support/*.ada $testdir/support/*.a $testdir/support/*.tst $dir/suppo
# Find out the size in bit of an address on the target # Find out the size in bit of an address on the target
target_gnatmake $testdir/support/impbit.adb >> $dir/acats.log 2>&1 target_gnatmake $testdir/support/impbit.adb >> $dir/acats.log 2>&1
if [ $? -ne 0 ]; then
display "**** Failed to compile impbit"
exit 1
fi
target_run $dir/support/impbit > $dir/support/impbit.out 2>&1 target_run $dir/support/impbit > $dir/support/impbit.out 2>&1
target_bit=`cat $dir/support/impbit.out` target_bit=`cat $dir/support/impbit.out`
echo target_bit="$target_bit" >> $dir/acats.log echo target_bit="$target_bit" >> $dir/acats.log
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment