[m-rev.] diff: fix failure of tests/debugger/save

[Julien Fischer]

Estimated hours taken: 0.2
Branches: main, release

Fix the failure of tests/debugger/save.  The problem was that the on systems
where the XML browser was enabled the output of this test case included
the commands used to control the XML browser.  These commands will contain
system specific parts.  The fix is to (a) provide a second expected output
that includes the XML browser commands and (b) pipe the output through
sed to remove the system specific bits.

tests/debugger/Mmakefile:
	Pipe the output of the save testcase through sed to remove
	system specific dependencies.

tests/debugger/save.exp2:
	Provide a second expected output for systems where the XML
	browser is enabled.

Julien.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.122
diff -u -r1.122 Mmakefile
--- Mmakefile	31 Mar 2006 05:12:15 -0000	1.122
+++ Mmakefile	13 Apr 2006 02:23:19 -0000
@@ -464,8 +464,14 @@
 retry.out: retry retry.inp
 	$(MDB_STD) ./retry < retry.inp > retry.out 2>&1

+# The values of xml_browser_cmd and xml_tmp_filename will be system specific,
+# so we pipe the output through sed and replace the system specific bit
+# with a known character sequence.
 save.out: save save.inp
-	$(MDB) ./save < save.inp > save.out 2>&1
+	$(MDB) ./save < save.inp 2>&1 | \
+		sed 's/xml_browser_cmd.*/xml_browser_cmd XXX/g' | \
+		sed 's/xml_tmp_filename.*/xml_tmp_filename XXX/g' \
+		> save.out 2>&1

 shallow.out: shallow shallow.inp
 	$(MDB) ./shallow < shallow.inp > shallow.out 2>&1
Index: save.exp2
===================================================================
RCS file: save.exp2
diff -N save.exp2
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ save.exp2	13 Apr 2006 02:23:46 -0000
@@ -0,0 +1,108 @@
+       1:      1  1 CALL pred save.main/2-0 (cc_multi) save.m:17
+mdb> echo on
+Command echo enabled.
+mdb> register --quiet
+mdb> b data
+ 0: + stop  interface pred save.data/1-0 (det)
+mdb> b nodiag
+ 1: + stop  interface pred save.nodiag/3-0 (semidet)
+mdb> condition B = 5
+ 1: + stop  interface pred save.nodiag/3-0 (semidet)
+            B = 5
+mdb> context nextline
+Contexts will be printed on the next line.
+mdb> scroll 42
+Scroll window size set to 42.
+mdb> alias x save
+x      =>    save
+mdb> trust save
+Trusting module save
+mdb> save save_file
+Debugger state saved to save_file.
+mdb> continue -n -S
+[1, 3, 5, 2, 4]
+alias ? help
+alias EMPTY step
+alias NUMBER step
+alias P print *
+alias b break
+alias c continue
+alias d stack
+alias e exception
+alias excp exception
+alias f finish
+alias g goto
+alias h help
+alias p print
+alias r retry
+alias s step
+alias v vars
+alias x save
+printlevel some
+echo on
+scroll on
+scroll 42
+stack_default_limit 0
+context nextline
+goal_paths on
+break pred*save.data/1-0
+break pred*save.nodiag/3-0
+condition B = 5
+scope interface
+format -P flat
+format_param -P -f depth 3
+format_param -P -f size 10
+format_param -P -f width 80
+format_param -P -f lines 25
+format_param -P -r depth 3
+format_param -P -r size 10
+format_param -P -r width 80
+format_param -P -r lines 25
+format_param -P -v depth 3
+format_param -P -v size 10
+format_param -P -v width 80
+format_param -P -v lines 25
+format_param -P -p depth 3
+format_param -P -p size 10
+format_param -P -p width 80
+format_param -P -p lines 25
+format -B flat
+format_param -B -f depth 10
+format_param -B -f size 30
+format_param -B -f width 80
+format_param -B -f lines 25
+format_param -B -r depth 10
+format_param -B -r size 30
+format_param -B -r width 80
+format_param -B -r lines 25
+format_param -B -v depth 10
+format_param -B -v size 30
+format_param -B -v width 80
+format_param -B -v lines 25
+format_param -B -p depth 10
+format_param -B -p size 30
+format_param -B -p width 80
+format_param -B -p lines 25
+format -A flat
+format_param -A -f depth 3
+format_param -A -f size 10
+format_param -A -f width 80
+format_param -A -f lines 2
+format_param -A -r depth 3
+format_param -A -r size 10
+format_param -A -r width 80
+format_param -A -r lines 2
+format_param -A -v depth 3
+format_param -A -v size 10
+format_param -A -v width 80
+format_param -A -v lines 5
+format_param -A -p depth 3
+format_param -A -p size 10
+format_param -A -p width 80
+format_param -A -p lines 2
+max_io_actions 20
+xml_browser_cmd XXX
+xml_tmp_filename XXX
+trust save
+trust std lib
+list_context_lines 2

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------