Update of unstable Boolean test cases

diff --git a/tests/boolean/gdml_private/B5 b/tests/boolean/gdml_private/B5
index c625d9a..561ad43 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 eb6a218..f8f8e2e 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 b3b04be..f2897a3 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 a56ada5..fc96fd2 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 90ab117..5cb54b9 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 b5cdf1f..3afa034 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 cc4de0f..3f24c8e 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 a07a19a..c47fd17 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 86ad53e..0c02f2c 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 e50d30e..56e572c 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 89ea408..f4d1578 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 1fc14f0..30f7732 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 0228c4f..2f7b45d 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 ebc6770..38bf902 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 ecb457c..f4eae7e 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 a067da6..c965d74 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