Revision: 76745
http://sourceforge.net/p/brlcad/code/76745
Author: starseeker
Date: 2020-08-13 19:39:21 +0000 (Thu, 13 Aug 2020)
Log Message:
-----------
Add test of -q option
Modified Paths:
--------------
brlcad/branches/RELEASE/regress/gdiff/gdiff.ref
brlcad/branches/RELEASE/regress/gdiff/regress-gdiff.cmake.in
Modified: brlcad/branches/RELEASE/regress/gdiff/gdiff.ref
===================================================================
--- brlcad/branches/RELEASE/regress/gdiff/gdiff.ref 2020-08-13 19:36:14 UTC
(rev 76744)
+++ brlcad/branches/RELEASE/regress/gdiff/gdiff.ref 2020-08-13 19:39:21 UTC
(rev 76745)
@@ -25,7 +25,18 @@
A box.r
A tor
-Test 3: gdiff -v moss_1.g moss_2.g
+Test 3: gdiff -q moss_1.g moss_2.g
+Added:
+box2.r, tor.s
+
+Removed:
+box.r, tor
+
+Changed:
+cone.r, box.s, all.g
+
+
+Test 4: gdiff -v moss_1.g moss_2.g
- "cone.r" id(p): 3000
+ "cone.r" id(p): 0
D "cone.r" region_id(a): 3000
@@ -50,7 +61,7 @@
A box2.r
A tor.s
-Test 4: gdiff -vv moss_1.g moss_2.g
+Test 5: gdiff -vv moss_1.g moss_2.g
- "cone.r" id(p): 3000
+ "cone.r" id(p): 0
D "cone.r" region_id(a): 3000
@@ -97,14 +108,14 @@
A "tor.s" V(p): 4.91623592376700013772961 -32.8022308349599995835888
31.71177673340000069401867
A "tor.s" DB5_MINORTYPE(p): tor
-Test 5: gdiff -a -d moss_1.g moss_2.g
+Test 6: gdiff -a -d moss_1.g moss_2.g
-Test 6: gdiff -m moss_1.g moss_2.g
+Test 7: gdiff -m moss_1.g moss_2.g
M ellipse.r
M cone.s
M tor
-Test 7: gdiff -u moss_1.g moss_3.g
+Test 8: gdiff -u moss_1.g moss_3.g
platform.r
light.r
cone.r
@@ -111,7 +122,7 @@
tor.r
box.r
-Test 8: gdiff -t 10 moss_1.g moss_2.g
+Test 9: gdiff -t 10 moss_1.g moss_2.g
M cone.r
M box.s
D box.r
@@ -120,7 +131,7 @@
A box2.r
A tor.s
-Test 9: gdiff -t 100 moss_1.g moss_2.g
+Test 10: gdiff -t 100 moss_1.g moss_2.g
M cone.r
D box.r
M all.g
@@ -128,22 +139,22 @@
A box2.r
A tor.s
-Test 10: gdiff -F "-type region" moss_1.g moss_2.g
+Test 11: gdiff -F "-type region" moss_1.g moss_2.g
M cone.r
D box.r
A box2.r
-Test 11: gdiff -F "-type region" -a -d moss_1.g moss_2.g
+Test 12: gdiff -F "-type region" -a -d moss_1.g moss_2.g
D box.r
A box2.r
-Test 12: gdiff -F "! -attr region_id" -a -d moss_1.g moss_2.g
+Test 13: gdiff -F "! -attr region_id" -a -d moss_1.g moss_2.g
M box.s
M all.g
D tor
A tor.s
-Test 13: gdiff moss_2.g moss_1.g moss_3.g
+Test 14: gdiff moss_2.g moss_1.g moss_3.g
M ellipse.r
M cone.s
M cone.r
@@ -154,7 +165,7 @@
A(L) box2.r
A(L) tor.s
-Test 14: gdiff -v moss_2.g moss_1.g moss_3.g
+Test 15: gdiff -v moss_2.g moss_1.g moss_3.g
A(R) "ellipse.r" prop1(p): 1
M(R) "cone.s" D(p): 4.997601260198356598607461 4.997601260198356598607461 0
M(R) "cone.s" C(p): 4.997601260198356598607461 -4.997601260198356598607461 0
@@ -174,7 +185,7 @@
A(L) box2.r
A(L) tor.s
-Test 15: gdiff -vv moss_2.g moss_1.g moss_3.g
+Test 16: gdiff -vv moss_2.g moss_1.g moss_3.g
A(R) "ellipse.r" prop1(p): 1
M(R) "cone.s" D(p): 4.997601260198356598607461 4.997601260198356598607461 0
M(R) "cone.s" C(p): 4.997601260198356598607461 -4.997601260198356598607461 0
Modified: brlcad/branches/RELEASE/regress/gdiff/regress-gdiff.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/gdiff/regress-gdiff.cmake.in
2020-08-13 19:36:14 UTC (rev 76744)
+++ brlcad/branches/RELEASE/regress/gdiff/regress-gdiff.cmake.in
2020-08-13 19:39:21 UTC (rev 76745)
@@ -62,6 +62,14 @@
)
GDIFF_CHECK_RESULT(gdiff_result)
+GDIFF_CHECK_INIT("\nTest ${TN}: gdiff -q moss_1.g moss_2.g\n")
+execute_process(
+ COMMAND "${GDIFF}" -q "${CSDIR}/moss_1.g" "${CSDIR}/moss_2.g"
+ RESULT_VARIABLE gdiff_result OUTPUT_VARIABLE gdiff_log ERROR_VARIABLE
gdiff_log
+ WORKING_DIRECTORY ${CBDIR}
+ )
+GDIFF_CHECK_RESULT(gdiff_result)
+
GDIFF_CHECK_INIT("\nTest ${TN}: gdiff -v moss_1.g moss_2.g\n")
execute_process(
COMMAND "${GDIFF}" -v "${CSDIR}/moss_1.g" "${CSDIR}/moss_2.g"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
