Update of unstable Boolean test cases

diff --git a/tests/boolean/gdml_private/B5 b/tests/boolean/gdml_private/B5
index c625d9ae96e5cdeccaa46716782514e29be53a39..561ad439a12c48375e743a4bec083c820f78627b 100644 (file)
--- a/tests/boolean/gdml_private/B5
+++ b/tests/boolean/gdml_private/B5
@@ -3,8 +3,9 @@ puts "TODO OCC26018 ALL: TEST INCOMPLETE"
 puts "TODO ?OCC26018 ALL: Process killed by CPU limit"
 puts "TODO ?OCC26017 Debian60-64: \\*\\* Exception"
 puts "TODO ?OCC26017 Debian60-64: An exception was caught"
-puts "TODO ?OCC26017 Debian60-64: Tcl Exception:"
-puts "TODO ?OCC26017 Debian60-64: Error: sh141385A0_copy is not a valid shape
+puts "TODO ?OCC26017 ALL: Tcl Exception:"
+puts "TODO ?OCC26017 ALL: Error: sh141385A0_copy is not a valid shape"
+puts "TODO ?OCC26017 ALL Error: sh59D36470_copy is not a valid shape"
 
 source [locate_data_file 20000_asm-gene.asm.6.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/F8 b/tests/boolean/gdml_private/F8
index eb6a218ee34ac10058b387829e231d88f1f05971..f8f8e2e7b531a2df03506a0362e752cc15a4c6c5 100644 (file)
--- a/tests/boolean/gdml_private/F8
+++ b/tests/boolean/gdml_private/F8
@@ -1,5 +1,6 @@
 puts "TODO OCC26018 ALL: Error : The area of the resulting shape is"
 puts "TODO OCC26018 Debian60-64: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC26017 Windows: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 20000_et1_401-ta6027.prt.2.gdml.tcl]
 
 ## image is differ from application

diff --git a/tests/boolean/gdml_private/L9 b/tests/boolean/gdml_private/L9
index b3b04bec91cc3201e37b15e12e4f4efc67b8e0c1..f2897a3e9bab607d2264feaf48634f37818b0f99 100644 (file)
--- a/tests/boolean/gdml_private/L9
+++ b/tests/boolean/gdml_private/L9
@@ -1,4 +1,4 @@
 puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26017 Debian60-64: TEST INCOMPLETE"
+puts "TODO ?OCC26017 ALL: TEST INCOMPLETE"
 source [locate_data_file 20000_g1-2_ss1.asm.2.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/O7 b/tests/boolean/gdml_private/O7
index a56ada5b9338feb317ccd0afa87ec47eb69522b9..fc96fd23bf56195ef1686f9dda386949057b0a58 100644 (file)
--- a/tests/boolean/gdml_private/O7
+++ b/tests/boolean/gdml_private/O7
@@ -1,2 +1,3 @@
+puts "TODO ?OCC26017 Windows: TEST INCOMPLETE"
 source [locate_data_file 20000_h1-2_et6_401-ta13459.prt.2.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/O8 b/tests/boolean/gdml_private/O8
index 90ab117a11b4532b97289abd3eb9bce0ab5cd64f..5cb54b9b214927787849b0da42765cbeb62911d2 100644 (file)
--- a/tests/boolean/gdml_private/O8
+++ b/tests/boolean/gdml_private/O8
@@ -1,3 +1,4 @@
+puts "TODO ?OCC26017 Windows: TEST INCOMPLETE"
 puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 20000_h1-2_et6_401-ta13460.prt.2.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/O9 b/tests/boolean/gdml_private/O9
index b5cdf1f0bc6066d3daf9124068761ec311178a6c..3afa0340d5158797903fe3718170e5bf8818596f 100644 (file)
--- a/tests/boolean/gdml_private/O9
+++ b/tests/boolean/gdml_private/O9
@@ -1,3 +1,4 @@
 puts "TODO OCC26018 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC26017 ALL: TEST INCOMPLETE"
 source [locate_data_file 20000_h1-2_rdc.asm.3.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/P1 b/tests/boolean/gdml_private/P1
index cc4de0fa69a481296cae3481b30bb0e5b79e48e5..3f24c8e768889aeacc1adf7295152eeffff4f336 100644 (file)
--- a/tests/boolean/gdml_private/P1
+++ b/tests/boolean/gdml_private/P1
@@ -1,3 +1,4 @@
 puts "TODO OCC26018 Windows: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC26017 ALL: TEST INCOMPLETE"
 source [locate_data_file 20000_h1-2_rdc_401-ta13415.prt.2.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/P2 b/tests/boolean/gdml_private/P2
index a07a19ad9e277f1e885a7c6cc05ad7b58048ae0f..c47fd17225b7f12a9317fa524d05b06c83138ee2 100644 (file)
--- a/tests/boolean/gdml_private/P2
+++ b/tests/boolean/gdml_private/P2
@@ -1,3 +1,4 @@
 puts "TODO OCC26018 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC26017 ALL: TEST INCOMPLETE"
 source [locate_data_file 20000_h1-2_rdc_401-ta13416.prt.3.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/W2 b/tests/boolean/gdml_private/W2
index 86ad53e0f12535696c4b84012207eb56ed274b92..0c02f2c91a8317760229307f4936f6da774ba5c7 100644 (file)
--- a/tests/boolean/gdml_private/W2
+++ b/tests/boolean/gdml_private/W2
@@ -1,4 +1,6 @@
 puts "TODO ?OCC26017 ALL: TEST INCOMPLETE"
+puts "TODO ?OCC26017 Debian60-64: \\*\\* Exception"
+puts "TODO ?OCC26017 Debian60-64: An exception was caught"
 puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 20000_ss2_401-ta5993.prt.2.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/ZD3 b/tests/boolean/gdml_private/ZD3
index e50d30e3ba6a61893365a1c290e8dcc53ec45175..56e572c89d60d68dbee7006fe13739da812b297e 100644 (file)
--- a/tests/boolean/gdml_private/ZD3
+++ b/tests/boolean/gdml_private/ZD3
@@ -1,3 +1,3 @@
-puts "TODO OCC26018 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 200a0-1_sopac-dn500.asm.1.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/ZD6 b/tests/boolean/gdml_private/ZD6
index 89ea40803fa222a7d327e0c6a6d454c653537adb..f4d1578a184dcc6f268cdaf1ca954b18500547ba 100644 (file)
--- a/tests/boolean/gdml_private/ZD6
+++ b/tests/boolean/gdml_private/ZD6
@@ -1,3 +1,3 @@
-puts "TODO OCC26018 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 200a0-1_sopac-dn500_piquage.prt.1.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/ZG2 b/tests/boolean/gdml_private/ZG2
index 1fc14f0c364522eb5b5adba3d0b5364b0f0d87c4..30f77320911164f547de92902a7a697beadcca16 100644 (file)
--- a/tests/boolean/gdml_private/ZG2
+++ b/tests/boolean/gdml_private/ZG2
@@ -1,2 +1,3 @@
+puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 51356_revol_circle.prt.1.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/ZH5 b/tests/boolean/gdml_private/ZH5
index 0228c4f6773f15a4a4a4cb61228c97e407678d37..2f7b45d352854dbcc2beaf8798d1c40b9e103001 100644 (file)
--- a/tests/boolean/gdml_private/ZH5
+++ b/tests/boolean/gdml_private/ZH5
@@ -1,2 +1,8 @@
+puts "TODO OCC26018 ALL: Error: bopcheck failed"
 source [locate_data_file 52109_shapiro.prt.gdml.tcl]
 
+set bcheck [bopcheck result]
+puts $bcheck
+if {![regexp {This shape seems to be OK.} $bcheck]} {
+  puts "Error: bopcheck failed"
+}
\ No newline at end of file

diff --git a/tests/boolean/gdml_public/B2 b/tests/boolean/gdml_public/B2
index ebc677060c0e000e39782cc2628c4f3698c54f6f..38bf9022676e1378d2fa7140ceede6ed28fd9833 100644 (file)
--- a/tests/boolean/gdml_public/B2
+++ b/tests/boolean/gdml_public/B2
@@ -1,3 +1,4 @@
+puts "TODO OCC26018 ALL: Error : The area of the resulting shape is"
 # test script for hole_full_prism_rect.prt.2.gdml file
 compound result
 
@@ -33,3 +34,5 @@ bcut sh48C48E0 sh467E330_copy sh48D1E70_copy; copy sh48C48E0 sh48C48E0_copy
 
 # result
 add sh48C48E0_copy result
+
+set square 0
\ No newline at end of file

diff --git a/tests/boolean/volumemaker/A8 b/tests/boolean/volumemaker/A8
index ecb457c33512d67501ed67148236885c9e44d294..f4eae7ebf0c1c4d05b2611d0ee9560f0d112587a 100644 (file)
--- a/tests/boolean/volumemaker/A8
+++ b/tests/boolean/volumemaker/A8
@@ -3,7 +3,7 @@
 
 puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO OCC26020 ALL: Error: bopcheck failed"
-puts "TODO OCC26020 Debian60-64: Error : The area of the resulting shape is"
+puts "TODO ?OCC26019 ALL: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 -4.2580937183769834 -506.18339008981781 147.62942729477928 0.98768834059988952 -6.6728564553435301e-012 -0.15643446501022945

diff --git a/tests/boolean/volumemaker/E6 b/tests/boolean/volumemaker/E6
index a067da6844e1f3f760888ad0ebd81c7206261ad5..c965d7435b5022af839241fe8b0c2b599d477911 100644 (file)
--- a/tests/boolean/volumemaker/E6
+++ b/tests/boolean/volumemaker/E6
@@ -2,6 +2,7 @@
 # cone plane killed by cpulimit 300
 
 puts "TODO OCC26020 ALL: TEST INCOMPLETE"
+puts "TODO ?OCC26019 ALL: Process killed by CPU limit"
 
 # planar face 
 plane pln_f1 -460.8377555733228 -1160 -121.8751945104883 0.17364817766693036 -5.955424826592936e-017 -0.98480775301220813