* pr-5022.ch, pr-5022.exp: New testcase.

	* chillvars.exp:  Remove spurious newline.

5 files changed, 100 insertions, 2 deletions

diff --git a/gdb/testsuite/gdb.chill/.Sanitize b/gdb/testsuite/gdb.chill/.Sanitize
index 68fae62..fffff90 100644
--- a/gdb/testsuite/gdb.chill/.Sanitize
+++ b/gdb/testsuite/gdb.chill/.Sanitize
@@ -30,6 +30,8 @@ chillvars.exp
 configure.in
 pr-5020.ch
 pr-5020.exp
+pr-5022.ch
+pr-5022.exp
 
 Things-to-lose:
 
diff --git a/gdb/testsuite/gdb.chill/ChangeLog b/gdb/testsuite/gdb.chill/ChangeLog
new file mode 100644
index 0000000..3626013
--- /dev/null
+++ b/gdb/testsuite/gdb.chill/ChangeLog
@@ -0,0 +1,14 @@
+Thu Jun  9 15:20:43 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* pr-5022.ch, pr-5022.exp:  New testcase.
+	* chillvars.exp:  Remove spurious newline.
+
+	* Makefile.in:  Bunch of fixes so it actually works in this
+	directory.  (E.g. add extra ../ where needed.)
+	Also, add .exe to executables, so we can use suffix rules.
+	* chexp.exp (test_print_reject):  Update syntax error message.
+	* chillvars.ch (module PR_5020):  Moved from here ...
+	* pr-5022.ch: ... to this new file.
+	* chillvars.exp, pr-5020.exp (binfile):  Add .exe extension.
+	* chillvars.exp, pr-5020.exp: Don't check all_flag.
+	* pr-5020.exp:  Add more tests; fix "print y pretty" output.
diff --git a/gdb/testsuite/gdb.chill/chillvars.exp b/gdb/testsuite/gdb.chill/chillvars.exp
index 0e1a930..6b430cf 100644
--- a/gdb/testsuite/gdb.chill/chillvars.exp
+++ b/gdb/testsuite/gdb.chill/chillvars.exp
@@ -182,8 +182,7 @@ proc test_arrays {} {
     gdb_test_exact "ptype bytetable4" \
 	{type = ARRAY (1:2) ARRAY ('c':'d') ARRAY (FALSE:TRUE) BYTE}
     gdb_test_exact "print bytetable4" \
-    {= [(1): [('c'): [(FALSE): 0, (TRUE): 1], ('d'): [(FALSE): 2, (TRUE): 3]], (2
-): [('c'): [(FALSE): 4, (TRUE): 5], ('d'): [(FALSE): 6, (TRUE): 7]]]}
+    {= [(1): [('c'): [(FALSE): 0, (TRUE): 1], ('d'): [(FALSE): 2, (TRUE): 3]], (2): [('c'): [(FALSE): 4, (TRUE): 5], ('d'): [(FALSE): 6, (TRUE): 7]]]}
 
     gdb_test "ptype ubytetable1"	"type = ARRAY \[(\]+0:4\[)\]+ UBYTE"
     gdb_test_exact "print ubytetable1"	\
diff --git a/gdb/testsuite/gdb.chill/pr-5022.ch b/gdb/testsuite/gdb.chill/pr-5022.ch
new file mode 100644
index 0000000..aeaad4e
--- /dev/null
+++ b/gdb/testsuite/gdb.chill/pr-5022.ch
@@ -0,0 +1,12 @@
+PR_5022: MODULE
+  dummy_pr_5022: PROC ();
+  END;
+  DCL p PTR;
+  DCL i INT;
+
+  p := NULL;
+  dummy_pr_5022 ();
+  i := 13;
+  p := ->i;
+  dummy_pr_5022 ();
+END;
diff --git a/gdb/testsuite/gdb.chill/pr-5022.exp b/gdb/testsuite/gdb.chill/pr-5022.exp
new file mode 100644
index 0000000..9b77713
--- /dev/null
+++ b/gdb/testsuite/gdb.chill/pr-5022.exp
@@ -0,0 +1,71 @@
+# Copyright (C) 1992 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+# Please email any bugs, comments, and/or additions to this file to:
+# bug-gdb@prep.ai.mit.edu
+
+# This file was written by Per Bothner. (bothner@cygnus.com)
+
+if $tracelevel then {
+	strace $tracelevel
+}
+
+proc do_tests {} {
+    global prms_id bug_id subdir objdir srcdir binfile prompt
+
+    set prms_id 0
+    set bug_id 0
+
+    # Start with a fresh gdb.
+
+    gdb_exit
+    gdb_start
+    gdb_reinitialize_dir $srcdir/$subdir
+    gdb_load $objdir/$subdir/$binfile
+
+    send "set language chill\n" ; expect -re "$prompt $"
+
+    # This is needed (at least on SunOS4) to make sure the
+    # the symbol table is read.
+    send "break gdbme.ch:3\n" ; expect -re "$prompt $"
+    send "delete 1\n" ; expect -re "$prompt $"
+
+    send "set width 0\n" ; expect -re "$prompt $"
+    send "set print sevenbit-strings\n" ; expect -re "$prompt $"
+
+    test_pr_5022
+}
+
+proc test_pr_5022 {} {
+    global prompt
+    runto dummy_pr_5022
+    gdb_test "p p" " = NULL" "print NULL pointer"
+    send "continue\n" ; expect -re "$prompt $"
+    gdb_test "p p" {= PTR\(H'[0-9a-fA-F]+\)} "print non-NULL pointer"
+}
+
+# Check to see if we have an executable to test.  If not, then either we
+# haven't tried to compile one, or the compilation failed for some reason.
+# In either case, just notify the user and skip the tests in this file.
+
+set binfile "pr-5022.exe"
+set srcfile $binfile.ch
+
+if ![file exists $objdir/$subdir/$binfile] then {
+    warning "$binfile does not exist; tests suppressed."
+} else {
+    do_tests
+}