[m-rev.] for review: move xml browser test to debugger/declarative

[Ian MacLarty]

For review by anyone.

Estimated hours taken: 0.5
Branches: main

Move the test of the xml browser in the declarative debugger from the debugger
directory to the debugger/declarative directory.  The declarative debugger does
not work in non gc grades and the debugger tests are run in non gc grades.  The
debugger/declarative tests are not, however, run in non gc grades.

tests/debugger/browser_test.exp:
tests/debugger/browser_test.inp:
tests/debugger/declarative/browse_arg.exp:
tests/debugger/declarative/browse_arg.inp:
	Move the dd xml browser test from debugger/browser_test to 
	debugger/declarative/browse_arg.

Index: tests/debugger/browser_test.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/browser_test.exp,v
retrieving revision 1.23
diff -u -r1.23 browser_test.exp
--- tests/debugger/browser_test.exp	22 Feb 2005 22:27:49 -0000	1.23
+++ tests/debugger/browser_test.exp	1 Apr 2005 03:35:08 -0000
@@ -166,79 +166,6 @@
 		<small functor="small" type="browser_test.big" arity="0" />
 	</big>
 </big>
-mdb> dd
-big_data(big(big(big/3, 2, small), 3, big(big/3, 6, small)))
-Valid? browse --xml 1
-Saving term to XML file...
-Launching XML browser (this may take some time) ...
-<?xml version="1.0"?>
-<big functor="big" type="browser_test.big" arity="3">
-	<big functor="big" type="browser_test.big" arity="3">
-		<big functor="big" type="browser_test.big" arity="3">
-			<small functor="small" type="browser_test.big" arity="0" />
-			<Int type="int">1</Int>
-			<small functor="small" type="browser_test.big" arity="0" />
-		</big>
-		<Int type="int">2</Int>
-		<small functor="small" type="browser_test.big" arity="0" />
-	</big>
-	<Int type="int">3</Int>
-	<big functor="big" type="browser_test.big" arity="3">
-		<big functor="big" type="browser_test.big" arity="3">
-			<small functor="small" type="browser_test.big" arity="0" />
-			<Int type="int">4</Int>
-			<big functor="big" type="browser_test.big" arity="3">
-				<small functor="small" type="browser_test.big" arity="0" />
-				<Int type="int">5</Int>
-				<small functor="small" type="browser_test.big" arity="0" />
-			</big>
-		</big>
-		<Int type="int">6</Int>
-		<small functor="small" type="browser_test.big" arity="0" />
-	</big>
-</big>
-big_data(big(big(big/3, 2, small), 3, big(big/3, 6, small)))
-Valid? b -x
-Saving term to XML file...
-Launching XML browser (this may take some time) ...
-<?xml version="1.0"?>
-<predicate functor="predicate" type="mdb.browse.xml_predicate_wrapper" arity="2">
-	<String type="string" field="predicate_name">browser_test.big_data</String>
-	<List functor="[|]" field="predicate_arguments" type="list.list(std_util.univ)" arity="2">
-		<univ_cons functor="univ_cons" type="std_util.univ" arity="1">
-			<big functor="big" type="browser_test.big" arity="3">
-				<big functor="big" type="browser_test.big" arity="3">
-					<big functor="big" type="browser_test.big" arity="3">
-						<small functor="small" type="browser_test.big" arity="0" />
-						<Int type="int">1</Int>
-						<small functor="small" type="browser_test.big" arity="0" />
-					</big>
-					<Int type="int">2</Int>
-					<small functor="small" type="browser_test.big" arity="0" />
-				</big>
-				<Int type="int">3</Int>
-				<big functor="big" type="browser_test.big" arity="3">
-					<big functor="big" type="browser_test.big" arity="3">
-						<small functor="small" type="browser_test.big" arity="0" />
-						<Int type="int">4</Int>
-						<big functor="big" type="browser_test.big" arity="3">
-							<small functor="small" type="browser_test.big" arity="0" />
-							<Int type="int">5</Int>
-							<small functor="small" type="browser_test.big" arity="0" />
-						</big>
-					</big>
-					<Int type="int">6</Int>
-					<small functor="small" type="browser_test.big" arity="0" />
-				</big>
-			</big>
-		</univ_cons>
-		<Nil functor="[]" type="list.list(std_util.univ)" arity="0" />
-	</List>
-</predicate>
-big_data(big(big(big/3, 2, small), 3, big(big/3, 6, small)))
-Valid? abort
-Diagnosis aborted.
-      E3:     C2 EXIT pred browser_test.big_data/1-0 (det) browser_test.m:37 (browser_test.m:20)
 mdb> set -A -f depth 1
 mdb> print *
        Data (arg 1)           	big(big/3, 3, big/3)
Index: tests/debugger/browser_test.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/browser_test.inp,v
retrieving revision 1.13
diff -u -r1.13 browser_test.inp
--- tests/debugger/browser_test.inp	22 Feb 2005 22:27:49 -0000	1.13
+++ tests/debugger/browser_test.inp	1 Apr 2005 03:31:19 -0000
@@ -40,10 +40,6 @@
 set xml_browser_cmd 'cat ./browser_test.xml.out'
 browse --xml 1
 browse -x Data
-dd
-browse --xml 1
-b -x
-abort
 set -A -f depth 1
 print *
 print Data/1
Index: tests/debugger/declarative/browse_arg.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/browse_arg.exp,v
retrieving revision 1.5
diff -u -r1.5 browse_arg.exp
--- tests/debugger/declarative/browse_arg.exp	5 Nov 2004 06:30:21 -0000	1.5
+++ tests/debugger/declarative/browse_arg.exp	8 Apr 2005 02:37:15 -0000
@@ -9,6 +9,8 @@
 mdb> finish
        3:      2  2 EXIT pred browse_arg.p/2-0 (det) browse_arg.m:19 (browse_arg.m:8)
 mdb> set depth 10
+mdb> set xml_browser_cmd 'cat ./browse_arg.xml.out'
+mdb> set xml_tmp_filename './browse_arg.xml.out'
 mdb> dd
 p(1, baz(1, bar))
 Valid? browse 2
@@ -31,6 +33,37 @@
   2-bar
 
 Valid? set -P format pretty
+p(1, baz(1, bar))
+Valid? b -x 2
+Saving term to XML file...
+Launching XML browser (this may take some time) ...
+<?xml version="1.0"?>
+<baz functor="baz" type="browse_arg.foo" arity="2">
+	<Int type="int">1</Int>
+	<bar functor="bar" type="browse_arg.foo" arity="0" />
+</baz>
+p(1, baz(1, bar))
+Valid? b --xml
+Saving term to XML file...
+Launching XML browser (this may take some time) ...
+<?xml version="1.0"?>
+<predicate functor="predicate" type="mdb.browse.xml_predicate_wrapper" arity="2">
+	<String type="string" field="predicate_name">browse_arg.p</String>
+	<List functor="[|]" field="predicate_arguments" type="list.list(std_util.univ)" arity="2">
+		<univ_cons functor="univ_cons" type="std_util.univ" arity="1">
+			<Int type="int">1</Int>
+		</univ_cons>
+		<List functor="[|]" type="list.list(std_util.univ)" arity="2">
+			<univ_cons functor="univ_cons" type="std_util.univ" arity="1">
+				<baz functor="baz" type="browse_arg.foo" arity="2">
+					<Int type="int">1</Int>
+					<bar functor="bar" type="browse_arg.foo" arity="0" />
+				</baz>
+			</univ_cons>
+			<Nil functor="[]" type="list.list(std_util.univ)" arity="0" />
+		</List>
+	</List>
+</predicate>
 p(1, baz(1, bar))
 Valid? no
 Found incorrect contour:
Index: tests/debugger/declarative/browse_arg.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/browse_arg.inp,v
retrieving revision 1.3
diff -u -r1.3 browse_arg.inp
--- tests/debugger/declarative/browse_arg.inp	5 Nov 2004 06:30:21 -0000	1.3
+++ tests/debugger/declarative/browse_arg.inp	8 Apr 2005 02:35:45 -0000
@@ -4,6 +4,8 @@
 continue
 finish
 set depth 10
+set xml_browser_cmd 'cat ./browse_arg.xml.out'
+set xml_tmp_filename './browse_arg.xml.out'
 dd
 browse 2
 ls
@@ -11,6 +13,8 @@
 set format verbose
 set -B format pretty
 set -P format pretty
+b -x 2
+b --xml
 no
 yes
 continue
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------