procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libgo: Set name of test when using DejaGNU tests.

Browse source 
From-SVN: r171805
This commit is contained in:
Ian Lance Taylor 2011-03-31 23:03:20 +00:00
parent 300d83d9de
commit de90644af8
4 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libgo/Makefile.am
View file

@ -1551,7 +1551,7 @@ CHECK = \
prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \
test "$${prefix}" != "." || prefix="$(@D)"; \
if test "$(use_dejagnu)" = "yes"; then \
$(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS); \
$(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" $(GOTESTFLAGS); \
else \
if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
echo "PASS: $(@D)"; \

2
libgo/Makefile.in
View file

@ -1881,7 +1881,7 @@ CHECK = \
prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \
test "$${prefix}" != "." || prefix="$(@D)"; \
if test "$(use_dejagnu)" = "yes"; then \
$(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS); \
$(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" $(GOTESTFLAGS); \
else \
if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
echo "PASS: $(@D)"; \

14
libgo/testsuite/gotest
View file

@ -33,6 +33,7 @@ keep=false
prefix=
dejagnu=no
timeout=60
testname=""
while $loop; do
case "x$1" in
x--srcdir)
@ -93,6 +94,15 @@ while $loop; do
timeout=`echo $1 | sed -e 's/^--timeout=//'`
shift
;;
x--testname)
testname=$2
shift
shift
;;
x--testname=*)
testname=`echo $1 | sed -e 's/^--testname=//'`
shift
;;
x-*)
loop=false
;;
@ -386,6 +396,10 @@ xyes)
cd ../testsuite
rm -rf _obj _test
mkdir _obj _test
if test "$testname" != ""; then
GOTESTNAME="$testname"
export GOTESTNAME
fi
$MAKE check RUNTESTFLAGS="$RUNTESTFLAGS GOTEST_TMPDIR=$DIR"
# Useful when using make check-target-libgo
cat libgo.log >> libgo-all.log

8
libgo/testsuite/libgo.testmain/testmain.exp
View file

@ -57,4 +57,10 @@ if ![ string match "" $comp_output ] {
set result [libgo_load "./a.exe" "-test.short" ""]
set status [lindex $result 0]
$status go
set name "go"
if [info exists env(GOTESTNAME)] {
set name "$env(GOTESTNAME)"
}
$status $name