diff options
| -rw-r--r-- | gdb/testsuite/gdb.chill/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.chill/Makefile.in | 11 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.chill/callch.ch | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.chill/callch.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.chill/chexp.exp | 12 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.chill/misc.exp | 3 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.chill/pr-6632.exp | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.chill/pr-8136.exp | 5 |
8 files changed, 40 insertions, 15 deletions
diff --git a/gdb/testsuite/gdb.chill/ChangeLog b/gdb/testsuite/gdb.chill/ChangeLog index f9aff38..7c009b3 100644 --- a/gdb/testsuite/gdb.chill/ChangeLog +++ b/gdb/testsuite/gdb.chill/ChangeLog @@ -1,3 +1,12 @@ +Wed Nov 29 19:28:13 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * Makefile.in: Add .exp.check rule. + * callch.ch: Add missing "%." to format strings. + * callch.exp: Fix argument to gdb_load. + * chexp.exp: Add specific error messages to test_print_reject calls. + * misc.exp: Add a test for PR 8496. + * pr-6632.exp, pr-8136.exp: Link executables from two .o files. + Sat Nov 25 20:49:27 1995 Fred Fish <fnf@phydeaux.cygnus.com> * pr-5016.exp: xfail "whatis i" for alpha-osf-dec-osf2*, same as linux. diff --git a/gdb/testsuite/gdb.chill/Makefile.in b/gdb/testsuite/gdb.chill/Makefile.in index 8270d0f..f8c0dc6 100644 --- a/gdb/testsuite/gdb.chill/Makefile.in +++ b/gdb/testsuite/gdb.chill/Makefile.in @@ -1,4 +1,5 @@ srcdir = @srcdir@ +VPATH = @srcdir@ PROGS = callch.exe chillvars.exe misc.exe result.exe string.exe tuples.exe \ pr-4975.exe pr-5016.exe pr-5020.exe pr-5022.exe pr-5646.exe \ @@ -9,6 +10,16 @@ all: #### host, target, and site specific Makefile frags come in here. +.SUFFIXES: .ch .o .exe .exp .check + +# Do 'make chillvars.check' to run just the chillvars.{ch,exp} test. + +.exp.check: + rootme=`pwd`/; export rootme; \ + cd .. ; \ + $(MAKE) just-check RUNTESTFLAGS="${RUNTESTFLAGS} $*.exp" \ + EXPECT=${EXPECT} + clean mostlyclean: -rm -f *.o $OBJS} ${PROGS} *~ core diff --git a/gdb/testsuite/gdb.chill/callch.ch b/gdb/testsuite/gdb.chill/callch.ch index 3c48bb2..6001d92 100644 --- a/gdb/testsuite/gdb.chill/callch.ch +++ b/gdb/testsuite/gdb.chill/callch.ch @@ -22,14 +22,14 @@ king : proc (p otto loc, x otto in); p := [[h'ff,h'ff],[h'ff,h'ff]]; do for i:= lower(bool) to upper(bool); do for j:= lower(bool) to upper(bool); - writetext(stdout, "x(%C, %C) = %C.%/", i, j, x(i, j)); - writetext(stdout, "p(%C, %C) = %C.%/", i, j, p(i, j)); + writetext(stdout, "x(%C, %C) = %C%..%/", i, j, x(i, j)); + writetext(stdout, "p(%C, %C) = %C%..%/", i, j, p(i, j)); od; od; end king; ralph : proc (x str1 in); - writetext(stdout, "x.f1 = %C, x.f2 = %C.%/", x.f1, x.f2); + writetext(stdout, "x.f1 = %C, x.f2 = %C%..%/", x.f1, x.f2); end ralph; whitney : proc (x str2 in); @@ -37,7 +37,7 @@ whitney : proc (x str2 in); do for i:= lower(bool) to upper(bool); do for j:= lower(bool) to upper(bool); - writetext(stdout, "x.f1(%C, %C) = %C.%/", i, j, x.f1(i, j)); + writetext(stdout, "x.f1(%C, %C) = %C%..%/", i, j, x.f1(i, j)); od; od; diff --git a/gdb/testsuite/gdb.chill/callch.exp b/gdb/testsuite/gdb.chill/callch.exp index 158fb91..36d4f11 100644 --- a/gdb/testsuite/gdb.chill/callch.exp +++ b/gdb/testsuite/gdb.chill/callch.exp @@ -44,7 +44,7 @@ proc do_tests {} { gdb_exit gdb_start gdb_reinitialize_dir $srcdir/$subdir - gdb_load $objdir/$subdir/$binfile + gdb_load $binfile send "set language chill\n" ; diff --git a/gdb/testsuite/gdb.chill/chexp.exp b/gdb/testsuite/gdb.chill/chexp.exp index b3c00c5..39a83fd 100644 --- a/gdb/testsuite/gdb.chill/chexp.exp +++ b/gdb/testsuite/gdb.chill/chexp.exp @@ -162,18 +162,18 @@ proc test_integer_literals_rejected {} { # Test various binary values. - test_print_reject "p B'2" - test_print_reject "p B'12" + test_print_reject "p B'2" "Too-large digit in bitstring or integer." + test_print_reject "p B'12" "Too-large digit in bitstring or integer." # Test various octal values. - test_print_reject "p O'9" - test_print_reject "p O'79" + test_print_reject "p O'9" "Too-large digit in bitstring or integer." + test_print_reject "p O'79" "Too-large digit in bitstring or integer." # Test various hexadecimal values. - test_print_reject "p H'G" - test_print_reject "p H'AG" + test_print_reject "p H'G" "Invalid character in bitstring or integer." + test_print_reject "p H'AG" "Invalid character in bitstring or integer." } proc test_boolean_literals_accepted {} { diff --git a/gdb/testsuite/gdb.chill/misc.exp b/gdb/testsuite/gdb.chill/misc.exp index 306b061..94be69c 100644 --- a/gdb/testsuite/gdb.chill/misc.exp +++ b/gdb/testsuite/gdb.chill/misc.exp @@ -77,6 +77,9 @@ if ![set_lang_chill] then { gdb_test "print OTto" " = 42" gdb_test "print NULL" " = NULL" "print emptiness literal" + # This tests PR 8496. + gdb_test {printf "%d %d.\n", 3+4,2} "7 2." "printf with 2 arguments" + # Linux thinks this is at line 6, but is otherwise ok. setup_xfail "i*86-*-linux*" gdb_test "info line" \ diff --git a/gdb/testsuite/gdb.chill/pr-6632.exp b/gdb/testsuite/gdb.chill/pr-6632.exp index 5b2c7f6..51650f5 100644 --- a/gdb/testsuite/gdb.chill/pr-6632.exp +++ b/gdb/testsuite/gdb.chill/pr-6632.exp @@ -28,7 +28,8 @@ if [skip_chill_tests] then { continue } set testfile2 "pr-6632-grt" set srcfile2 ${srcdir}/$subdir/${testfile2}.ch -if { [compile "${srcfile2} -g -c"] != "" } { +set objfile2 ${objdir}/$subdir/${testfile2}.o +if { [compile "${srcfile2} -g -c -o ${objfile2}"] != "" } { perror "Couldn't compile ${srcfile2}" return -1 } @@ -36,7 +37,7 @@ if { [compile "${srcfile2} -g -c"] != "" } { set testfile "pr-6632" set srcfile ${srcdir}/$subdir/${testfile}.ch set binfile ${objdir}/${subdir}/${testfile}.exe -if { [compile "${srcfile} -g -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } { +if { [compile "${srcfile} ${objfile2} -g -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } { perror "Couldn't compile ${srcfile}" return -1 } diff --git a/gdb/testsuite/gdb.chill/pr-8136.exp b/gdb/testsuite/gdb.chill/pr-8136.exp index 29f99a9..133144f 100644 --- a/gdb/testsuite/gdb.chill/pr-8136.exp +++ b/gdb/testsuite/gdb.chill/pr-8136.exp @@ -27,7 +27,8 @@ if [skip_chill_tests] then { continue } set testfile2 "func1" set srcfile2 ${srcdir}/$subdir/${testfile2}.ch -if { [compile "${srcfile2} -g -c"] != "" } { +set objfile2 ${objdir}/$subdir/${testfile2}.o +if { [compile "${srcfile2} -g -c -o ${objfile2}"] != "" } { perror "Couldn't compile ${srcfile2}" return -1 } @@ -35,7 +36,7 @@ if { [compile "${srcfile2} -g -c"] != "" } { set testfile "pr-8136" set srcfile ${srcdir}/$subdir/pr-8136.ch set binfile ${objdir}/${subdir}/${testfile}.exe -if { [compile "${srcfile} -g -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } { +if { [compile "${srcfile} -g ${objfile2} -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } { perror "Couldn't compile ${srcfile}" return -1 } |