diff --git a/src/DrawResources/TestCommands.tcl b/src/DrawResources/TestCommands.tcl
index 5e24abc41c..1b00089ec2 100644
--- a/src/DrawResources/TestCommands.tcl
+++ b/src/DrawResources/TestCommands.tcl
@@ -1657,33 +1657,13 @@ proc _tests_platform_def {} {
     global env tcl_platform
 
     if [info exists env(os_type)] { return }
-
     set env(os_type) $tcl_platform(platform)
-
-    # use detailed mapping for various versions of Lunix
-    # (note that mapping is rather non-uniform, for historical reasons)
-    if { $tcl_platform(os) == "Linux" && ! [catch {exec cat /etc/issue} issue] } {
-	if { [regexp {Mandriva[ \tA-Za-z]+([0-9]+)} $issue res num] } {
-	    set env(os_type) Mandriva$num
-	} elseif { [regexp {Red Hat[ \tA-Za-z]+([0-9]+)} $issue res num] } {
-	    set env(os_type) RedHat$num
-	} elseif { [regexp {Debian[ \tA-Za-z/]+([0-9]+)[.]([0-9]+)} $issue res num subnum] } {
-	    set env(os_type) Debian$num$subnum
-	} elseif { [regexp {Debian[ \tA-Za-z/]+([0-9]+)} $issue res num] } {
-	    set env(os_type) Debian${num}0
-	} elseif { [regexp {CentOS[ \tA-Za-z]+([0-9]+)[.]([0-9]+)} $issue res num subnum] } {
-	    set env(os_type) CentOS$num$subnum
-	} elseif { [regexp {Scientific[ \tA-Za-z]+([0-9]+)[.]([0-9]+)} $issue res num subnum] } {
-	    set env(os_type) SL$num$subnum
-	} elseif { [regexp {Fedora Core[ \tA-Za-z]+([0-9]+)} $issue res num] } {
-	    set env(os_type) FedoraCore$num
-	}
-	if { [exec uname -m] == "x86_64" } {
-	    set env(os_type) "$env(os_type)-64"
-	}
-    } elseif { $tcl_platform(os) == "Darwin" } {
-        set env(os_type) MacOS
+	if { $tcl_platform(os) == "Linux" } {
+        set env(os_type) Linux
     }
+	if { $tcl_platform(os) == "Darwin" } {
+        set env(os_type) MacOS
+    } 
 }
 _tests_platform_def
 
diff --git a/tests/boolean/gdml_private/B5 b/tests/boolean/gdml_private/B5
index 4dd96d4c10..fb4b8d5e81 100644
--- a/tests/boolean/gdml_private/B5
+++ b/tests/boolean/gdml_private/B5
@@ -1,8 +1,8 @@
 # ? - because sometimes test is killed by elapsed time
 puts "TODO OCC26018 ALL: TEST INCOMPLETE"
 puts "TODO ?OCC26018 ALL: Process killed by CPU limit"
-puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception"
-puts "TODO ?OCC26017 Debian70-64: An exception was caught"
+puts "TODO ?OCC26017 Linux: \\*\\* Exception"
+puts "TODO ?OCC26017 Linux: An exception was caught"
 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"
diff --git a/tests/boolean/gdml_private/F8 b/tests/boolean/gdml_private/F8
index cb909311e1..b15ffc3832 100644
--- a/tests/boolean/gdml_private/F8
+++ b/tests/boolean/gdml_private/F8
@@ -1,5 +1,5 @@
 puts "TODO OCC26018 ALL: Error : The area of the resulting shape is"
-puts "TODO OCC26018 Debian70-64: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC26018 Linux: 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]
 
diff --git a/tests/boolean/gdml_private/G1 b/tests/boolean/gdml_private/G1
index 8ae3d9c647..57b888cfe8 100644
--- a/tests/boolean/gdml_private/G1
+++ b/tests/boolean/gdml_private/G1
@@ -1,7 +1,7 @@
-puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception"
-puts "TODO ?OCC26017 Debian70-64: An exception was caught"
+puts "TODO ?OCC26017 Linux: \\*\\* Exception"
+puts "TODO ?OCC26017 Linux: An exception was caught"
 puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26017 Debian70-64: Process killed by CPU limit"
-puts "TODO ?OCC26017 Debian70-64: TEST INCOMPLETE"
+puts "TODO ?OCC26017 Linux: Process killed by CPU limit"
+puts "TODO ?OCC26017 Linux: TEST INCOMPLETE"
 source [locate_data_file 20000_et1_401-ta6029.prt.2.gdml.tcl]
 
diff --git a/tests/boolean/gdml_private/G7 b/tests/boolean/gdml_private/G7
index 4f174e3402..1af9cde9a7 100644
--- a/tests/boolean/gdml_private/G7
+++ b/tests/boolean/gdml_private/G7
@@ -1,5 +1,5 @@
 puts "TODO OCC26018 ALL: Error : The area of the resulting shape is"
-puts "TODO OCC26018 Debian70-64: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC26018 Linux: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 20000_et3_401-ta6037.prt.2.gdml.tcl]
 
 ## image is differ from application
diff --git a/tests/boolean/gdml_private/J4 b/tests/boolean/gdml_private/J4
index bd6ae6456a..220be3d348 100644
--- a/tests/boolean/gdml_private/J4
+++ b/tests/boolean/gdml_private/J4
@@ -1,4 +1,4 @@
 puts "TODO OCC26018 Windows: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26017 Debian70-64: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC26017 Linux: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 20000_et5_401-ta6160.prt.2.gdml.tcl]
 
diff --git a/tests/boolean/gdml_private/K8 b/tests/boolean/gdml_private/K8
index 84e2107219..6071518e62 100644
--- a/tests/boolean/gdml_private/K8
+++ b/tests/boolean/gdml_private/K8
@@ -1,7 +1,7 @@
 # ? - because sometimes test is killed by elapsed time
 
-puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception"
-puts "TODO ?OCC26017 Debian70-64: An exception was caught"
+puts "TODO ?OCC26017 Linux: \\*\\* Exception"
+puts "TODO ?OCC26017 Linux: An exception was caught"
 puts "TODO ?OCC26017 ALL: TEST INCOMPLETE"
 puts "TODO ?OCC26017 ALL: Process killed by CPU limit"
 puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
diff --git a/tests/boolean/gdml_private/L3 b/tests/boolean/gdml_private/L3
index 94dd71572a..eecc4a4c4e 100644
--- a/tests/boolean/gdml_private/L3
+++ b/tests/boolean/gdml_private/L3
@@ -1,7 +1,7 @@
 puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception"
-puts "TODO ?OCC26017 Debian70-64: An exception was caught"
-puts "TODO ?OCC26017 Debian70-64: TEST INCOMPLETE"
-puts "TODO ?OCC26017 Debian70-64: Process killed by CPU limit"
+puts "TODO ?OCC26017 Linux: \\*\\* Exception"
+puts "TODO ?OCC26017 Linux: An exception was caught"
+puts "TODO ?OCC26017 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC26017 Linux: Process killed by CPU limit"
 source [locate_data_file 20000_g1-2_et1.asm.5.gdml.tcl]
 
diff --git a/tests/boolean/gdml_private/L4 b/tests/boolean/gdml_private/L4
index dad93ba810..5c524036b6 100644
--- a/tests/boolean/gdml_private/L4
+++ b/tests/boolean/gdml_private/L4
@@ -1,5 +1,5 @@
 puts "TODO OCC26018 ALL: Error : The area of the resulting shape is"
-puts "TODO OCC26018 Debian70-64: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC26018 Linux: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 20000_g1-2_et3.asm.2.gdml.tcl]
 
 ## image is differ from application
diff --git a/tests/boolean/gdml_private/L5 b/tests/boolean/gdml_private/L5
index d6fe0aad8f..6abb59c523 100644
--- a/tests/boolean/gdml_private/L5
+++ b/tests/boolean/gdml_private/L5
@@ -1,7 +1,7 @@
 puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26017 Debian70-64: XIO:  fatal IO error"
-puts "TODO ?OCC26017 Debian70-64: TEST INCOMPLETE"
-puts "TODO ?OCC26017 Debian70-64: Tcl Exception"
-puts "TODO ?OCC26017 Debian70-64: Error: shC26D310_copy is not a valid shape"
+puts "TODO ?OCC26017 Linux: XIO:  fatal IO error"
+puts "TODO ?OCC26017 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC26017 Linux: Tcl Exception"
+puts "TODO ?OCC26017 Linux: Error: shC26D310_copy is not a valid shape"
 source [locate_data_file 20000_g1-2_et4.asm.3.gdml.tcl]
 
diff --git a/tests/boolean/gdml_private/W2 b/tests/boolean/gdml_private/W2
index a3ce45762b..a98d027848 100644
--- a/tests/boolean/gdml_private/W2
+++ b/tests/boolean/gdml_private/W2
@@ -1,6 +1,6 @@
 puts "TODO ?OCC26017 ALL: TEST INCOMPLETE"
-puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception"
-puts "TODO ?OCC26017 Debian70-64: An exception was caught"
+puts "TODO ?OCC26017 Linux: \\*\\* Exception"
+puts "TODO ?OCC26017 Linux: An exception was caught"
 puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO ?OCC26017 ALL: Process killed by CPU limit"
 source [locate_data_file 20000_ss2_401-ta5993.prt.2.gdml.tcl]
diff --git a/tests/boolean/gdml_private/ZE4 b/tests/boolean/gdml_private/ZE4
index 42ae5d16f0..33657d0544 100644
--- a/tests/boolean/gdml_private/ZE4
+++ b/tests/boolean/gdml_private/ZE4
@@ -1,5 +1,5 @@
-puts "TODO ?OCC26017 Debian70-64: TEST INCOMPLETE"
-puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception"
-puts "TODO ?OCC26017 Debian70-64: An exception was caught"
+puts "TODO ?OCC26017 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC26017 Linux: \\*\\* Exception"
+puts "TODO ?OCC26017 Linux: An exception was caught"
 source [locate_data_file 401-ta6001-3.prt.1.gdml.tcl]
 
diff --git a/tests/boolean/gdml_private/ZK3 b/tests/boolean/gdml_private/ZK3
index dd4f047f9d..2953183861 100644
--- a/tests/boolean/gdml_private/ZK3
+++ b/tests/boolean/gdml_private/ZK3
@@ -1,8 +1,8 @@
-puts "TODO ?OCC26017 Debian70-64: TEST INCOMPLETE"
-puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception"
-puts "TODO ?OCC26017 Debian70-64: An exception was caught"
-puts "TODO ?OCC26017 Debian70-64: X Error of failed request"
-puts "TODO ?OCC26017 Debian70-64: XIO:  fatal IO error 11"
-puts "TODO ?OCC26017 Debian70-64: Process killed by CPU limit"
+puts "TODO ?OCC26017 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC26017 Linux: \\*\\* Exception"
+puts "TODO ?OCC26017 Linux: An exception was caught"
+puts "TODO ?OCC26017 Linux: X Error of failed request"
+puts "TODO ?OCC26017 Linux: XIO:  fatal IO error 11"
+puts "TODO ?OCC26017 Linux: Process killed by CPU limit"
 source [locate_data_file voile_3.asm.1.gdml.tcl]
 
diff --git a/tests/boolean/volumemaker/A4 b/tests/boolean/volumemaker/A4
index 118058c429..f41e0732fa 100644
--- a/tests/boolean/volumemaker/A4
+++ b/tests/boolean/volumemaker/A4
@@ -3,7 +3,7 @@
 
 puts "TODO ?OCC26019 ALL: Error: bopcheck failed"
 puts "TODO ?OCC26019 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26019 Debian70-64: Error : The area of the resulting shape is"
+puts "TODO ?OCC26019 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 -2740.6595835899998 -150 -1050 1.110223024625157e-016 1 1.1102230246251563e-016
diff --git a/tests/boolean/volumemaker/A7 b/tests/boolean/volumemaker/A7
index 881ae1dda1..352dd946bb 100644
--- a/tests/boolean/volumemaker/A7
+++ b/tests/boolean/volumemaker/A7
@@ -3,7 +3,7 @@
 
 puts "TODO ?OCC26019 ALL: Error: bopcheck failed"
 puts "TODO ?OCC26019 ALL: Error : The area of the resulting shape"
-puts "TODO ?OCC26019 Debian70-64: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC26019 Linux: Faulty shapes in variables faulty_1 to faulty_"
 
 # planar face 
 plane pln_f1 -1863.18155559 1250 -1538.57262704 1.110223024625157e-016 1 1.1102230246251563e-016
diff --git a/tests/boolean/volumemaker/B3 b/tests/boolean/volumemaker/B3
index 328ff5d399..ab548307df 100644
--- a/tests/boolean/volumemaker/B3
+++ b/tests/boolean/volumemaker/B3
@@ -2,8 +2,8 @@
 # plane
 
 puts "TODO OCC26020 ALL: Error: bopcheck failed"
-puts "TODO OCC26020 Debian70-64: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is"
+puts "TODO OCC26020 Linux: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC26020 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 590.6877421677151 -519.8775759738943 -93.555747452441423 0.64798185367609173 0.7547095802227719 -0.10263024323494339
diff --git a/tests/boolean/volumemaker/B4 b/tests/boolean/volumemaker/B4
index c4bc4f612b..b412ef4c31 100644
--- a/tests/boolean/volumemaker/B4
+++ b/tests/boolean/volumemaker/B4
@@ -3,7 +3,7 @@
 
 puts "TODO OCC26020 ALL: Error: bopcheck failed"
 puts "TODO ?OCC26019 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is"
+puts "TODO OCC26020 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 79.400363856921899 8.7220982904821555e-015 -94.116057183203139 -0.83335943573869897 -2.2204460492503131e-016 -0.55273144551877762
diff --git a/tests/boolean/volumemaker/B6 b/tests/boolean/volumemaker/B6
index c5577ed9bd..b8d4779af2 100644
--- a/tests/boolean/volumemaker/B6
+++ b/tests/boolean/volumemaker/B6
@@ -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 Debian70-64: Error : The area of the resulting shape is"
+puts "TODO OCC26020 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 35.877464033656999 5.9462928582193458e-016 -25.973690230789806 -0.64944804833018333 -3.0834627769631957e-016 -0.76040596560003137
diff --git a/tests/boolean/volumemaker/B9 b/tests/boolean/volumemaker/B9
index 6c8156812a..4bedb2a818 100644
--- a/tests/boolean/volumemaker/B9
+++ b/tests/boolean/volumemaker/B9
@@ -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 Debian70-64: Error : The area of the resulting shape is"
+puts "TODO OCC26020 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 32.294537607197917 1.8096910201742288e-014 -39.176406819310692 -0.77162458338772011 -6.6613381477509373e-016 -0.63607822027776384
diff --git a/tests/boolean/volumemaker/C1 b/tests/boolean/volumemaker/C1
index 3f33cc5213..4849aac87a 100644
--- a/tests/boolean/volumemaker/C1
+++ b/tests/boolean/volumemaker/C1
@@ -2,8 +2,8 @@
 # plane
 
 puts "TODO OCC26020 Windows: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is"
-puts "TODO OCC26020 Debian70-64: Error: bopcheck failed"
+puts "TODO OCC26020 Linux: Error : The area of the resulting shape is"
+puts "TODO OCC26020 Linux: Error: bopcheck failed"
 
 # planar face 
 plane pln_f1 -331.49269816258993 -487.15663197846379 -460.05843051255943 -0.29784456643004237 0.75470958022277179 -0.58455287508322795
diff --git a/tests/boolean/volumemaker/C3 b/tests/boolean/volumemaker/C3
index dd45a213cb..52eba83bc8 100644
--- a/tests/boolean/volumemaker/C3
+++ b/tests/boolean/volumemaker/C3
@@ -2,8 +2,8 @@
 # plane
 
 puts "TODO OCC26020 Windows: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO OCC26020 Debian70-64: Error : The mkvolume is not valid. The area is"
-puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is"
+puts "TODO OCC26020 Linux: Error : The mkvolume is not valid. The area is"
+puts "TODO OCC26020 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 -513.57358775546049 376.87261141864394 391.24411461018769 -0.35888381816183362 -0.86162916044152549 0.35888381816183351
diff --git a/tests/boolean/volumemaker/C9 b/tests/boolean/volumemaker/C9
index fb8937e36b..2ba08d8dce 100644
--- a/tests/boolean/volumemaker/C9
+++ b/tests/boolean/volumemaker/C9
@@ -2,8 +2,8 @@
 # cylinder plane unstable
 
 puts "TODO ?OCC26019 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26019 Debian70-64: Error: bopcheck failed"
-puts "TODO ?OCC26019 Debian70-64: Error : The area of the resulting shape is"
+puts "TODO ?OCC26019 Linux: Error: bopcheck failed"
+puts "TODO ?OCC26019 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 0 -875 -1.4432899320127035e-014 0 1 1.1102230246251565e-016
diff --git a/tests/boolean/volumemaker/D2 b/tests/boolean/volumemaker/D2
index a89e87220d..34540c42c5 100644
--- a/tests/boolean/volumemaker/D2
+++ b/tests/boolean/volumemaker/D2
@@ -3,7 +3,7 @@
 
 puts "TODO ?OCC26019 ALL: Error: bopcheck failed"
 puts "TODO ?OCC26019 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26019 Debian70-64: Error : The area of the resulting shape is"
+puts "TODO ?OCC26019 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 0 -232.5 3.8857805861880479e-015 0 -1 -1.1102230246251565e-016
diff --git a/tests/boolean/volumemaker/D4 b/tests/boolean/volumemaker/D4
index f4c886fdfc..e66854d180 100644
--- a/tests/boolean/volumemaker/D4
+++ b/tests/boolean/volumemaker/D4
@@ -2,7 +2,7 @@
 # cylinder plane
 
 puts "TODO OCC26020 ALL: Error: bopcheck failed"
-puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is"
+puts "TODO OCC26020 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 1665.7013364039071 -825 -339.75605834598957 0.15643446504023129 4.4408920985006257e-016 0.98768834059513766
diff --git a/tests/boolean/volumemaker/D5 b/tests/boolean/volumemaker/D5
index 01af5f931c..a39f4acdd9 100644
--- a/tests/boolean/volumemaker/D5
+++ b/tests/boolean/volumemaker/D5
@@ -2,7 +2,7 @@
 # cylinder plane
 
 puts "TODO OCC26020 ALL: Error: bopcheck failed"
-puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is"
+puts "TODO OCC26020 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 0 -1450 -4.4408920985006262e-015 0 1 1.1102230246251565e-016
diff --git a/tests/boolean/volumemaker/D8 b/tests/boolean/volumemaker/D8
index 696a344941..969b7b4c4c 100644
--- a/tests/boolean/volumemaker/D8
+++ b/tests/boolean/volumemaker/D8
@@ -2,8 +2,8 @@
 # cylinder plane
 
 puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO OCC26020 Debian70-64: Error: bopcheck failed"
-puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is"
+puts "TODO OCC26020 Linux: Error: bopcheck failed"
+puts "TODO OCC26020 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 -335.23319463083521 698.25 1031.741684575172 0.95105651629515375 3.3306690738754676e-016 0.30901699437494723
diff --git a/tests/boolean/volumemaker/E4 b/tests/boolean/volumemaker/E4
index 3d600d502a..3fdf57e3ad 100644
--- a/tests/boolean/volumemaker/E4
+++ b/tests/boolean/volumemaker/E4
@@ -4,8 +4,8 @@
 
 puts "TODO OCC26020 ALL: TEST INCOMPLETE"
 puts "TODO ?OCC26020 ALL: Process killed by CPU limit"
-puts "TODO ?OCC26020 Debian70-64: \\*\\* Exception"
-puts "TODO ?OCC26020 Debian70-64: An exception"
+puts "TODO ?OCC26020 Linux: \\*\\* Exception"
+puts "TODO ?OCC26020 Linux: An exception"
 
 # planar face 
 plane pln_f1 460.8377555733228 -1160 121.87519451048833 -0.17364817766693036 1.1223734950417248e-017 0.98480775301220813
diff --git a/tests/boolean/volumemaker/F1 b/tests/boolean/volumemaker/F1
index e1f05d610c..12e45c1691 100644
--- a/tests/boolean/volumemaker/F1
+++ b/tests/boolean/volumemaker/F1
@@ -4,8 +4,8 @@
 
 puts "TODO OCC26020 Windows: Error status"
 puts "TODO OCC26020 Windows: TEST INCOMPLETE"
-puts "TODO OCC26020 Debian70-64: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26019 Debian70-64: Error: bopcheck failed"
+puts "TODO OCC26020 Linux: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC26019 Linux: Error: bopcheck failed"
 
 # planar face 
 plane pln_f1 -2.4595121467478056e-014 -746.52181700999995 1844.22896887 0.86602540378443849 -0.47367733686073094 -0.16009303715192033
diff --git a/tests/bugs/caf/bug1138 b/tests/bugs/caf/bug1138
index b142b58185..2fa8b988c2 100755
--- a/tests/bugs/caf/bug1138
+++ b/tests/bugs/caf/bug1138
@@ -1,6 +1,6 @@
-puts "TODO ?OCC12345 Debian70-64: An exception was caught"
-puts "TODO ?OCC12345 Debian70-64: Faulty OCC1138 : here is reading problem when the filename is a directory name."
-puts "TODO ?OCC12345 Debian70-64: Faulty OCC1138"
+puts "TODO ?OCC12345 Linux: An exception was caught"
+puts "TODO ?OCC12345 Linux: Faulty OCC1138 : here is reading problem when the filename is a directory name."
+puts "TODO ?OCC12345 Linux: Faulty OCC1138"
 
 puts "================"
 puts "OCC1138"
diff --git a/tests/bugs/fclasses/bug63 b/tests/bugs/fclasses/bug63
index 068309dcd9..97c45ca4e7 100755
--- a/tests/bugs/fclasses/bug63
+++ b/tests/bugs/fclasses/bug63
@@ -1,5 +1,5 @@
-puts "TODO OCC23626 Debian70-64 Windows: Tcl Exception"
-puts "TODO OCC23626 Debian70-64 Windows: TEST INCOMPLETE"
+puts "TODO OCC23626 ALL: Tcl Exception"
+puts "TODO OCC23626 ALL: TEST INCOMPLETE"
 
 puts "================"
 puts "OCC63"
diff --git a/tests/bugs/fclasses/bug7287_2 b/tests/bugs/fclasses/bug7287_2
index e652c98f0b..82469ebf25 100755
--- a/tests/bugs/fclasses/bug7287_2
+++ b/tests/bugs/fclasses/bug7287_2
@@ -1,5 +1,5 @@
-puts "TODO ?OCC25921 Debian70-64: Tcl Exception: Memory leak detected"
-puts "TODO ?OCC25921 Debian70-64: TEST INCOMPLETE"
+puts "TODO ?OCC25921 Linux: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC25921 Linux: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC7287"
diff --git a/tests/bugs/fclasses/bug7287_3 b/tests/bugs/fclasses/bug7287_3
index fd2b43cfc7..28488b74d5 100755
--- a/tests/bugs/fclasses/bug7287_3
+++ b/tests/bugs/fclasses/bug7287_3
@@ -1,5 +1,5 @@
-puts "TODO ?OCC25921 Debian70-64: Tcl Exception: Memory leak detected"
-puts "TODO ?OCC25921 Debian70-64: TEST INCOMPLETE"
+puts "TODO ?OCC25921 Linux: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC25921 Linux: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC7287"
diff --git a/tests/bugs/fclasses/bug7287_4 b/tests/bugs/fclasses/bug7287_4
index 9083edc170..9213c7c693 100755
--- a/tests/bugs/fclasses/bug7287_4
+++ b/tests/bugs/fclasses/bug7287_4
@@ -1,5 +1,5 @@
-puts "TODO ?OCC25921 Debian70-64: Tcl Exception: Memory leak detected"
-puts "TODO ?OCC25921 Debian70-64: TEST INCOMPLETE"
+puts "TODO ?OCC25921 Linux: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC25921 Linux: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC7287"
diff --git a/tests/bugs/fclasses/bug7287_5 b/tests/bugs/fclasses/bug7287_5
index 0bd8886210..4e6b93397a 100755
--- a/tests/bugs/fclasses/bug7287_5
+++ b/tests/bugs/fclasses/bug7287_5
@@ -1,5 +1,5 @@
-puts "TODO ?OCC25921 Debian70-64: Tcl Exception: Memory leak detected"
-puts "TODO ?OCC25921 Debian70-64: TEST INCOMPLETE"
+puts "TODO ?OCC25921 Linux: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC25921 Linux: TEST INCOMPLETE"
 
 
 puts "============"
diff --git a/tests/bugs/fclasses/bug7287_6 b/tests/bugs/fclasses/bug7287_6
index 4b92c8703b..09bc1380f2 100755
--- a/tests/bugs/fclasses/bug7287_6
+++ b/tests/bugs/fclasses/bug7287_6
@@ -1,5 +1,5 @@
-puts "TODO ?OCC25921 Debian70-64: Tcl Exception: Memory leak detected"
-puts "TODO ?OCC25921 Debian70-64: TEST INCOMPLETE"
+puts "TODO ?OCC25921 Linux: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC25921 Linux: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC7287"
diff --git a/tests/bugs/iges/buc60591_1 b/tests/bugs/iges/buc60591_1
index 4ea9ec846f..7108a2c197 100755
--- a/tests/bugs/iges/buc60591_1
+++ b/tests/bugs/iges/buc60591_1
@@ -1,5 +1,3 @@
-set os $env(os_type)
-
 puts "=========="
 puts "BUC60591"
 puts "=========="
diff --git a/tests/bugs/iges/buc60591_2 b/tests/bugs/iges/buc60591_2
index a5dad57e44..c09cfaf545 100755
--- a/tests/bugs/iges/buc60591_2
+++ b/tests/bugs/iges/buc60591_2
@@ -1,5 +1,3 @@
-set os $env(os_type)
-
 puts "=================================="
 puts "BUC60591"
 puts "=================================="
diff --git a/tests/bugs/iges/buc60591_3 b/tests/bugs/iges/buc60591_3
index 3d17511fd9..71bf882d74 100755
--- a/tests/bugs/iges/buc60591_3
+++ b/tests/bugs/iges/buc60591_3
@@ -1,5 +1,3 @@
-set os $env(os_type)
-
 puts "=================================="
 puts "BUC60591"
 puts "=================================="
diff --git a/tests/bugs/iges/buc60591_4 b/tests/bugs/iges/buc60591_4
index 8aae3abb87..ed8b0f903e 100755
--- a/tests/bugs/iges/buc60591_4
+++ b/tests/bugs/iges/buc60591_4
@@ -1,5 +1,3 @@
-set os $env(os_type)
-
 puts "BUC60591"
 puts ""
 puts "=================================="
diff --git a/tests/bugs/modalg_2/bug426 b/tests/bugs/modalg_2/bug426
index 9425e5f311..1b51ab8707 100755
--- a/tests/bugs/modalg_2/bug426
+++ b/tests/bugs/modalg_2/bug426
@@ -1,7 +1,5 @@
-if {[array get env os_type] != ""} {
-    set os $env(os_type)
-}
-if {[string compare $os "windows"] != 0 } {
+set env(os_type) $tcl_platform(platform)
+if {[string compare $env(os_type) "windows"] != 0 } {
     puts "TODO ?OCC12345 MacOS: \\*\\* Exception"
     puts "TODO ?OCC12345 MacOS: An exception was caught"
     puts "TODO ?OCC12345 MacOS: TEST INCOMPLETE"
diff --git a/tests/bugs/moddata_1/bug22759 b/tests/bugs/moddata_1/bug22759
index e93a2c52c8..82c4d6cb58 100755
--- a/tests/bugs/moddata_1/bug22759
+++ b/tests/bugs/moddata_1/bug22759
@@ -25,10 +25,8 @@ regexp { +([-0-9.+eE]+) +nodes} $tri_info full nod
 
 regexp {deflection +([-0-9.+eE]+)} $tri_info full defl
 
-if { [array get env os_type] != "" } {
-   set os $env(os_type)
-}
-if { [string compare $os "windows"] != 0 } {
+set env(os_type) $tcl_platform(platform)
+if { [string compare $env(os_type) "windows"] != 0 } {
    puts "OS = Linux"
    set good_tri  520414
    set good_nod  263938
diff --git a/tests/bugs/moddata_2/bug567 b/tests/bugs/moddata_2/bug567
index 8d15f3b14a..c2d2e7416f 100755
--- a/tests/bugs/moddata_2/bug567
+++ b/tests/bugs/moddata_2/bug567
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Faulty OCC565: function intersection works wrongly with trimmed Surfaces"
-puts "TODO OCC12345 Debian70-64 MacOS: Faulty OCC565: function intersection works wrongly with infinite Surfaces"
+puts "TODO OCC12345 Linux MacOS: Faulty OCC565: function intersection works wrongly with infinite Surfaces"
 
 puts "========"
 puts "OCC567"
diff --git a/tests/bugs/step/buc60948 b/tests/bugs/step/buc60948
index a85ad1b97d..b65e586df3 100755
--- a/tests/bugs/step/buc60948
+++ b/tests/bugs/step/buc60948
@@ -1,8 +1,6 @@
 puts "TODO OCC24156 MacOS: \\*\\*\\* Abort"
 puts "TODO OCC24156 MacOS: ... The exception is"
 
-set os $env(os_type)
-
 puts "========================"
 puts "BUC60948"
 puts "========================"
diff --git a/tests/bugs/step/bug23379 b/tests/bugs/step/bug23379
index 96ed4c7ea6..ab72161bc5 100755
--- a/tests/bugs/step/bug23379
+++ b/tests/bugs/step/bug23379
@@ -1,5 +1,3 @@
-set os $env(os_type)
-
 puts "================"
 puts "OCC23379"
 puts "================"
diff --git a/tests/bugs/step/bug46 b/tests/bugs/step/bug46
index d1cb81b42b..0571184370 100755
--- a/tests/bugs/step/bug46
+++ b/tests/bugs/step/bug46
@@ -1,5 +1,3 @@
-set os $env(os_type)
-
 puts "================"
 puts "OCC46"
 puts "================"
diff --git a/tests/bugs/step/bug51 b/tests/bugs/step/bug51
index 8e426c52d1..3a1955dedf 100755
--- a/tests/bugs/step/bug51
+++ b/tests/bugs/step/bug51
@@ -1,5 +1,3 @@
-set os $env(os_type)
-
 puts "================"
 puts "OCC51"
 puts "================"
diff --git a/tests/bugs/vis/buc60632_1 b/tests/bugs/vis/buc60632_1
index 1dcf5dddc4..1a4784f22a 100755
--- a/tests/bugs/vis/buc60632_1
+++ b/tests/bugs/vis/buc60632_1
@@ -1,9 +1,3 @@
-if { [array get env os_type] != "" } {
-    set os $env(os_type)
-}
-if { [string compare $os "windows"] != 0 } {
-}
-
 puts "================"
 puts "BUC60632"
 puts "================"
diff --git a/tests/bugs/vis/buc60632_2 b/tests/bugs/vis/buc60632_2
index ea6e9493b0..014eb2b9f2 100755
--- a/tests/bugs/vis/buc60632_2
+++ b/tests/bugs/vis/buc60632_2
@@ -1,9 +1,3 @@
-if { [array get env os_type] != "" } {
-    set os $env(os_type)
-}
-if { [string compare $os "windows"] != 0 } {
-}
-
 puts "================"
 puts "BUC60632"
 puts "================"
diff --git a/tests/bugs/vis/bug137_10 b/tests/bugs/vis/bug137_10
index 034d11e8d1..fa631b02f1 100755
--- a/tests/bugs/vis/bug137_10
+++ b/tests/bugs/vis/bug137_10
@@ -1,9 +1,3 @@
-if { [array get env os_type] != "" } {
-   set os $env(os_type)
-}
-if { [string compare $os "windows"] != 0 } {
-}
-
 puts "================"
 puts "OCC137"
 puts "================"
diff --git a/tests/bugs/vis/bug137_11 b/tests/bugs/vis/bug137_11
index 9d872a16da..03db837ca3 100755
--- a/tests/bugs/vis/bug137_11
+++ b/tests/bugs/vis/bug137_11
@@ -1,9 +1,3 @@
-if { [array get env os_type] != "" } {
-   set os $env(os_type)
-}
-if { [string compare $os "windows"] != 0 } {
-}
-
 puts "================"
 puts "OCC137"
 puts "================"
diff --git a/tests/bugs/vis/bug137_9 b/tests/bugs/vis/bug137_9
index 55465ac818..5174ea965a 100755
--- a/tests/bugs/vis/bug137_9
+++ b/tests/bugs/vis/bug137_9
@@ -1,9 +1,3 @@
-if { [array get env os_type] != "" } {
-   set os $env(os_type)
-}
-if { [string compare $os "windows"] != 0 } {
-}
-
 puts "================"
 puts "OCC137"
 puts "================"
diff --git a/tests/bugs/vis/bug22188 b/tests/bugs/vis/bug22188
index e76cec22aa..e7d8b9898e 100755
--- a/tests/bugs/vis/bug22188
+++ b/tests/bugs/vis/bug22188
@@ -23,7 +23,7 @@ regexp { +([-0-9.+eE]+) +triangles} $tri_info full tri
 regexp { +([-0-9.+eE]+) +nodes} $tri_info full nod
 regexp {Maximal deflection +([-0-9.+eE]+)} $tri_info full defl
 
-if { [string compare $tcl_platform(os) "Windows"] == 0 }  {
+if { [string compare $tcl_platform(platform) "windows"] == 0 }  {
    set good_tri  6114
    set good_nod  3080
    set good_defl 0.50050406431775729
diff --git a/tests/bugs/vis/bug232 b/tests/bugs/vis/bug232
index d93edfdef8..a185488355 100755
--- a/tests/bugs/vis/bug232
+++ b/tests/bugs/vis/bug232
@@ -61,10 +61,8 @@ set result23 [regexp "$Yellow" [vreadpixel $x4 $y4 rgb]]
 set result24 [regexp "$Yellow" [vreadpixel $x5 $y5 rgb]]
 set result25 [regexp "$Yellow" [vreadpixel $x6 $y6 rgb]]
 
-if { [array get env os_type] != "" } {
-    set os $env(os_type)
-}
-if { [string compare $os "windows"] != 0 } {
+set env(os_type) $tcl_platform(platform)
+if { [string compare $env(os_type) "windows"] != 0 } {
   set result31 [regexp "$Cyan" [vreadpixel $x2 $y2 rgb]]
   if { $result31 == 0 } {
     set IsFaulty 1
diff --git a/tests/bugs/vis/bug25732_1 b/tests/bugs/vis/bug25732_1
index c25fc537be..f007e5ec5f 100644
--- a/tests/bugs/vis/bug25732_1
+++ b/tests/bugs/vis/bug25732_1
@@ -18,7 +18,16 @@ vsetdispmode b 1
 
 vdrawtext text "Open\nCASCADE" -pos 0 0 0 -color 1.0 0.0 0.0 -halign center -valign center -angle -45 -zoom 1 -height 50 -aspect regular -font Arial
 
-set bug_info [vreadpixel 259 279 rgb name]
+set env(os_type) $tcl_platform(platform)
+if { [string compare ${env(os_type)} "windows"] != 0 } {
+  set x_coord 259
+  set y_coord 279
+} else {
+  set x_coord 255
+  set y_coord 277
+}
+
+set bug_info [vreadpixel ${x_coord} ${y_coord} rgb name]
 if {$bug_info != "RED"} {
   puts "ERROR: OCC25732 is reproduced. Text is missed."
 }
diff --git a/tests/bugs/xde/bug184 b/tests/bugs/xde/bug184
index 655464dc16..c6c3421dfd 100755
--- a/tests/bugs/xde/bug184
+++ b/tests/bugs/xde/bug184
@@ -1,5 +1,3 @@
-set os $env(os_type)
-
 puts "========"
 puts "OCC184"
 puts "========"
diff --git a/tests/bugs/xde/bug23384 b/tests/bugs/xde/bug23384
index 7b3deb1eee..2867a3bbbc 100755
--- a/tests/bugs/xde/bug23384
+++ b/tests/bugs/xde/bug23384
@@ -1,9 +1,5 @@
 # Original bug : 23384
 # Date : 16 Aug 2012
-
-if {[array get env os_type] != ""} {
-    set os $env(os_type)
-}
 XOpen [locate_data_file bug23384-doc_subshapes.xbf] doc
 set info1 [XStat doc]
 regexp {level N 0 +: +([-0-9.+eE]+)} $info1 full l0
@@ -46,15 +42,3 @@ if { ${l0} != ${l0_1} ||
      ${nbname} != ${nbname_1} } {
     puts "Error : Document is read/written wrong!"
 }
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/bugs/xde/bug314 b/tests/bugs/xde/bug314
index 055bd9fa0b..bb6bf3ab27 100755
--- a/tests/bugs/xde/bug314
+++ b/tests/bugs/xde/bug314
@@ -1,5 +1,3 @@
-set os $env(os_type)
-
 puts "========"
 puts "OCC314"
 puts "========"
diff --git a/tests/bugs/xde/bug321 b/tests/bugs/xde/bug321
index 29d99e492d..d5a5613462 100755
--- a/tests/bugs/xde/bug321
+++ b/tests/bugs/xde/bug321
@@ -1,5 +1,3 @@
-set os $env(os_type)
-
 puts "========"
 puts "OCC321"
 puts "========"
diff --git a/tests/chamfer/data/complex/B4 b/tests/chamfer/data/complex/B4
index 64bb4a9779..de7ed67d69 100644
--- a/tests/chamfer/data/complex/B4
+++ b/tests/chamfer/data/complex/B4
@@ -4,10 +4,6 @@ set chamf_dist_angle [list "0.08   30" "0.06   30" "0.1   30"]
 set chamf_dist_dist  [list "0.05 0.05" "0.05 0.09" "0.1 0.08"]
 set chamf_equal_dist [list "0.05     " "0.05     " "0.2     "]
 if { [string compare $command chamf_sequence] == 0 && [string compare $group equal_dist] == 0 } {
-  set os "ALL"
-  if {[array get env os_type] != ""} {
-    set os $env(os_type)
-  }
   puts "TODO OCC22909 ALL:Faulty shapes in variables faulty_1 to faulty_"
   puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed"
 }
diff --git a/tests/chamfer/data/complex/B5 b/tests/chamfer/data/complex/B5
index ff81c00576..fb3b83ded7 100644
--- a/tests/chamfer/data/complex/B5
+++ b/tests/chamfer/data/complex/B5
@@ -8,10 +8,6 @@ if { [string compare $command chamf] == 0 } {
     puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed"
   }
 } else {
-  set os "ALL"
-  if {[array get env os_type] != ""} {
-    set os $env(os_type)
-  }
   if {[string compare $group dist_angle] == 0} {
     puts "TODO OCC22909 MacOS: chamfer is not done. compute of chamfer failed"
   }
diff --git a/tests/chamfer/data/complex/B6 b/tests/chamfer/data/complex/B6
index f4f9530756..75bfaee80c 100644
--- a/tests/chamfer/data/complex/B6
+++ b/tests/chamfer/data/complex/B6
@@ -8,10 +8,6 @@ if { [string compare $command chamf] == 0 } {
     puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed"
   }
 } else {
-  set os "ALL"
-  if {[array get env os_type] != ""} {
-    set os $env(os_type)
-  }
   if {[string compare $group dist_angle] == 0} {
     puts "TODO OCC22909 All:Faulty shapes in variables faulty_1 to faulty_"
     puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed"
diff --git a/tests/chamfer/data/complex/B7 b/tests/chamfer/data/complex/B7
index cea26e25a4..415dd61335 100644
--- a/tests/chamfer/data/complex/B7
+++ b/tests/chamfer/data/complex/B7
@@ -6,10 +6,6 @@ set chamf_equal_dist [list "0.1     " " 0.2     "]
 if { [string compare $command chamf] == 0 } {
   puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed"
 } else {
-  set os "ALL"
-  if {[array get env os_type] != ""} {
-    set os $env(os_type)
-  }
   if {[string compare $group dist_angle] == 0} {
     puts "TODO OCC22909 MacOS: chamfer is not done. compute of chamfer failed"
   } else {
diff --git a/tests/chamfer/data/complex/B9 b/tests/chamfer/data/complex/B9
index 46607d5474..3ce8ce73f5 100644
--- a/tests/chamfer/data/complex/B9
+++ b/tests/chamfer/data/complex/B9
@@ -7,30 +7,24 @@ dset SCALE 100
 if { [string compare $command chamf_sequence] == 0 } {
   puts "TODO #22909 ALL: Error: The tests should be reviewed"
   puts "Error: The tests should be reviewed."
-  set os "ALL"
-  if {[array get env os_type] != ""} {
-    set os $env(os_type)
-  }
+  set env(os_type) $tcl_platform(platform)
   
-  if { [string compare ${os} "Windows-64-VC9"] != 0 && [string compare ${os} "Windows-64-VC10"] != 0} {
-    set nf 0
-    if {[string compare $os "Debian70-64"] == 0 } {
-      if { [string compare $group dist_dist] == 0 } {
-        set nf 2
-      } elseif { [string compare $group equal_dist] == 0 } {
-        set nf 4
-      }
+  set nf 0
+  if { [string compare ${env(os_type)} "windows"] != 0 } {
+    if { [string compare $group dist_dist] == 0 } {
+      set nf 2
+    } elseif { [string compare $group equal_dist] == 0 } {
+      set nf 4
     }
   }
   
-  if { [string compare ${os} "windows"] == 0} {
+  if { [string compare ${env(os_type)} "windows"] == 0} {
     if {[string compare $group dist_dist] == 0 || [string compare $group equal_dist] == 0 } {
       set nf 2
     }
   }
 
-  if { [string compare ${os} "MacOS"] == 0 } {
-    set nf 0
+  if { [string compare ${env(os_type)} "MacOS"] == 0 } {
     if { [string compare $group dist_dist] == 0 } {
       puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed"
       set nf 8
@@ -45,7 +39,7 @@ if { [string compare $command chamf_sequence] == 0 } {
   }  
 
   if { $nf != 0 } {
-     #puts "TODO OCC22909 $os:Faulty shapes in variables faulty_1 to faulty_$nf"
+     #puts "TODO OCC22909 $env(os_type):Faulty shapes in variables faulty_1 to faulty_$nf"
      puts "TODO OCC22909 ALL:Faulty shapes in variables faulty_1 to faulty_"
   }
 }
diff --git a/tests/de/step_3/F3 b/tests/de/step_3/F3
index 39ba6d70b2..874b06f7c3 100644
--- a/tests/de/step_3/F3
+++ b/tests/de/step_3/F3
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 Debian70-64: Error : 2 differences with reference data found :" 
+puts "TODO CR23096 Linux: Error : 2 differences with reference data found :" 
 
 set LinuxDiff 2
 set filename trj12_b3-sy-214.stp
diff --git a/tests/demo/draw/getsource b/tests/demo/draw/getsource
index 143151b8a2..49cd13ac9b 100755
--- a/tests/demo/draw/getsource
+++ b/tests/demo/draw/getsource
@@ -1,11 +1,8 @@
 # test for command getsource
 
 # check that path returned for command pload is as expected
-if { [array get env os_type] != "" } {
-    set os $env(os_type)
-}
-puts $os
-if { [string compare $os "windows"] == 0 } {
+set env(os_type) $tcl_platform(platform)
+if { [string compare $env(os_type) "windows"] == 0 } {
     set expected src/Draw/Draw_PloadCommands.cxx
 } else {
     set expected /src/Draw/Draw_PloadCommands.cxx
diff --git a/tests/draft/angle/G8 b/tests/draft/angle/G8
index 84383feefd..0c568533d9 100644
--- a/tests/draft/angle/G8
+++ b/tests/draft/angle/G8
@@ -1,6 +1,6 @@
 #F6----------------------------------------------
-puts "TODO OCC22803 Debian70-64: Error in depouille"
-puts "TODO OCC22803 Debian70-64: Error : The skin cannot be built."
+puts "TODO OCC22803 Linux: Error in depouille"
+puts "TODO OCC22803 Linux: Error : The skin cannot be built."
 puts "TODO OCC22803 Windows: Faulty shapes in variables faulty_1 to faulty_"
 polyline p 0 0 3  0 0 0  10 0 0  10 0 3  
 beziercurve bc 4 10 0 3  7 0 2  3 0 3  0 0 3
diff --git a/tests/draft/angle/M2 b/tests/draft/angle/M2
index 5c041b642c..d9d52c5314 100644
--- a/tests/draft/angle/M2
+++ b/tests/draft/angle/M2
@@ -2,7 +2,7 @@
 # Date : 02 Dec 98
 
 puts "TODO OCC22803 All: Error: The tolerance of the resulting shape is too big"
-#puts "TODO OCC23511 Debian70-64: The area of the resulting shape is 186543"
+#puts "TODO OCC23511 Linux: The area of the resulting shape is 186543"
 
 restore [locate_data_file CFE903_pro12ggx.rle] base
 
diff --git a/tests/heal/data/advanced/X1 b/tests/heal/data/advanced/X1
index 7f10a85ead..3cd112080e 100644
--- a/tests/heal/data/advanced/X1
+++ b/tests/heal/data/advanced/X1
@@ -1,15 +1,5 @@
 if {[string compare $command "SplitAngle"] == 0 } {
-    set os "ALL"
-    if {[array get env os_type] != ""} {
-       set os $env(os_type)
-    }
-    if {
-	    [string compare $os "Debian40"] != 0
-	&&  [string compare $os "Mandriva2008"] != 0
-	&&  [string compare $os "Mandriva2010"] != 0
-       } {
   puts "TODO OCC23245 ALL: Faulty shapes in variables faulty_1 to faulty_"
-    }
 }
 
 restore [locate_data_file GOUVERGUI.brep] a
diff --git a/tests/heal/data/advanced/Y6 b/tests/heal/data/advanced/Y6
index 04624e74e2..5aacd57455 100644
--- a/tests/heal/data/advanced/Y6
+++ b/tests/heal/data/advanced/Y6
@@ -1,8 +1,4 @@
 if {[string compare $command "SplitAngle"] == 0 } {
-    set os "ALL"
-    if {[array get env os_type] != ""} {
-       set os $env(os_type)
-    }
   puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_"
 }
 
diff --git a/tests/heal/data/advanced/ZF1 b/tests/heal/data/advanced/ZF1
index d382115be1..3923b81d77 100644
--- a/tests/heal/data/advanced/ZF1
+++ b/tests/heal/data/advanced/ZF1
@@ -1,15 +1 @@
-if {[string compare $command "SplitAngle"] == 0 } {
-    set os "ALL"
-    if {[array get env os_type] != ""} {
-       set os $env(os_type)
-    }
-    if {
-	    [string compare $os "Debian40"] == 0
-	||  [string compare $os "Mandriva2008"] == 0
-	||  [string compare $os "Mandriva2010"] == 0
-       } {
-    }
-}
-
 restore [locate_data_file cd.brep] a
-
diff --git a/tests/heal/data/advanced/ZF2 b/tests/heal/data/advanced/ZF2
index 948a8bbabc..aa071aaaca 100644
--- a/tests/heal/data/advanced/ZF2
+++ b/tests/heal/data/advanced/ZF2
@@ -1,15 +1,2 @@
-if {[string compare $command "SplitAngle"] == 0 } {
-    set os "ALL"
-    if {[array get env os_type] != ""} {
-       set os $env(os_type)
-    }
-    if {
-	    [string compare $os "Debian40"] == 0
-	||  [string compare $os "Mandriva2008"] == 0
-	||  [string compare $os "Mandriva2010"] == 0
-       } {
-    }
-}
-
 restore [locate_data_file cg.brep] a
 
diff --git a/tests/mesh/data/standard/G1 b/tests/mesh/data/standard/G1
index c76c1289ed..5d66d3bbcf 100755
--- a/tests/mesh/data/standard/G1
+++ b/tests/mesh/data/standard/G1
@@ -1,43 +1,14 @@
 set TheFileName shading_055.brep
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
+set env(os_type) $tcl_platform(os)
 if { [string compare $command "shading"] == 0 } {
    set nb 62
-   if {[string compare $os "Mandriva2008"] == 0} {
-      set nb 64
-   }
-   if {[string compare $os "Mandriva2010"] == 0} {
-      set nb 64
-   }
-   if {[string compare $os "Debian40"] == 0} {
-      set nb 72
-   }
 }
 if { [string compare $command "incmesh"] == 0 } {
    set nb 60
-   if {[string compare $os "Mandriva2008"] == 0} {
-      set nb 64
-   }
-   if {[string compare $os "Mandriva2010"] == 0} {
-      set nb 64
-   }
-   if {[string compare $os "Debian40"] == 0} {
-      set nb 72
-   }
 }
 if { [string compare $command "mesh"] == 0 } {
    set nb 36
-   if {[string compare $os "Mandriva2008"] == 0} {
-      set nb {40|56}
-   }
-   if {[string compare $os "Mandriva2010"] == 0} {
-      set nb 56
-   }
-   if {[string compare $os "Debian40"] == 0} {
-      set nb {51|61}
-   }
 }
+
 set bug_cross "OCC22687"
-set nbcross($os) $nb
+set nbcross($env(os_type)) $nb
diff --git a/tests/mesh/data/standard/U7 b/tests/mesh/data/standard/U7
index cc72be0b46..cf1d2f615e 100755
--- a/tests/mesh/data/standard/U7
+++ b/tests/mesh/data/standard/U7
@@ -4,43 +4,20 @@ set rel_tol 10.7
 set bug_withouttri "OCC22687"
 set bug_freelinks "OCC22687"
 set bug_freenodes "OCC22687"
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
+
 if { [string compare $command "shading"] == 0 } {
-###   set nbt 14
-   set nbt 9
-   set nbn 83
-   if {
-          [string compare $os "Mandriva2008"] == 0
-       || [string compare $os "Debian70-64"] == 0
-      } {
-###      set nbl 19
-###      set nbfree($os) $nbl
-##    else
-##      set nbl 17
-   }
-set nbwithouttri($os) $nbt
-set nbfreenodes($os) $nbn
+##set nbt 14
+  set nbt 9
+  set nbn 83
+  set nbwithouttri($env(os_type)) $nbt
+  set nbfreenodes($env(os_type)) $nbn
 } else {
-   if {
-          [string compare $os "Mandriva2010"] == 0
-      } {
-      set nbt 14
-      set nbn 83
-      set nbl 19
-      set nbwithouttri($os) $nbt
-      set nbfree($os) $nbl
-      set nbfreenodes($os) $nbn
-   } else {
-      set bug_withouttri "OCC23105"
-###      set nbt 14
-      set nbt 8
-      set nbn 60
-      set nbl 3
-      set nbwithouttri($os) $nbt
-      set nbfree($os) $nbl
-      set nbfreenodes($os) $nbn
-   }
+  set bug_withouttri "OCC23105"
+##set nbt 14
+  set nbt 8
+  set nbn 60
+  set nbl 3
+  set nbwithouttri($env(os_type)) $nbt
+  set nbfree($env(os_type)) $nbl
+  set nbfreenodes($env(os_type)) $nbn
 }
diff --git a/tests/mesh/data/standard/W4 b/tests/mesh/data/standard/W4
index 5cfbcf24ed..0cb15f3435 100755
--- a/tests/mesh/data/standard/W4
+++ b/tests/mesh/data/standard/W4
@@ -11,26 +11,9 @@ if { [string compare $command "shading"] == 0 } {
   set rel_tol 1.3
   set nbwithouttri(ALL) 6
   set nbfreenodes(ALL) 1
-###  set bug_freelinks "OCC22687"
-###  set nbfree(ALL) 2
+##set bug_freelinks "OCC22687"
+##set nbfree(ALL) 2
 } else {
   set nbfreenodes(ALL) 2
   set nbwithouttri(ALL) 5
 }
-###if { [string compare $command "mesh"] == 0 } {
-###  set os "ALL"
-###  if {[array get env os_type] != ""} {
-###    set os $env(os_type)
-###  }
-###  set bug_freelinks "OCC22687"
-###  if {[string compare $os "Mandriva2008"] == 0 || [string compare $os "MacOS"] == 0 || [string compare $os "Mandriva2010"] == 0 || [string compare $os "Debian40"] == 0 || [string compare $os "Debian70-64"] == 0 || [string compare $os "windows"] == 0} {
-###    set nb 4
-###  } else {
-###    set nb 6
-###  }
-###  set nbfree($os) $nb
-###}
-###if { [string compare $command "shading"] == 0 } {
-###  set bug_freelinks "OCC22687"
-###  set nbfree(ALL) 2
-###}
diff --git a/tests/mesh/end b/tests/mesh/end
index b9ed015721..ee661224d6 100644
--- a/tests/mesh/end
+++ b/tests/mesh/end
@@ -29,10 +29,6 @@ if { [string compare $command "shading"] == 0 } {
 }
 
 if { [string compare $command "incmesh"] == 0 } {
-    set os "ALL"
-    if {[array get env os_type] != ""} {
-	set os $env(os_type)
-    }
     if { [string compare $parallel "-parallel"] != 0 || [info exists count_parallel] == 0 } {
        set count_parallel 1
     }
diff --git a/tests/offset/wire_closed_inside_0_005/D1 b/tests/offset/wire_closed_inside_0_005/D1
index e28b25f469..13358e67c6 100644
--- a/tests/offset/wire_closed_inside_0_005/D1
+++ b/tests/offset/wire_closed_inside_0_005/D1
@@ -1,19 +1,6 @@
 puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
 puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
-
-if {
-        [string compare $os "Debian40"] != 0
-    &&  [string compare $os "Mandriva2010"] != 0
-    &&  [string compare $os "Mandriva2008"] != 0
-   } {
-  puts "TODO OCC23068 $os: Error : The resulting shape is WRONG"
-}
-
-
+puts "TODO OCC23068 ALL: Error : The resulting shape is WRONG"
 
 restore [locate_data_file offset_wire_041.brep] s
 
diff --git a/tests/offset/wire_closed_inside_0_005/H6 b/tests/offset/wire_closed_inside_0_005/H6
index f7745dbcb9..92e092a803 100644
--- a/tests/offset/wire_closed_inside_0_005/H6
+++ b/tests/offset/wire_closed_inside_0_005/H6
@@ -1,7 +1,7 @@
 puts "TODO OCC23748 ALL: Error : The offset cannot be built."
 puts "TODO OCC23748 Windows: Error: Offset is not done."
-puts "TODO OCC23748 Debian70-64: An exception was caught"
-puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*"
+puts "TODO OCC23748 Linux: An exception was caught"
+puts "TODO OCC23748 Linux: \\*\\* Exception \\*\\*"
 
 restore [locate_data_file offset_wire_092.brep] s
 
diff --git a/tests/offset/wire_closed_inside_0_005/I8 b/tests/offset/wire_closed_inside_0_005/I8
index 5dcb2ad46d..f91c587055 100644
--- a/tests/offset/wire_closed_inside_0_005/I8
+++ b/tests/offset/wire_closed_inside_0_005/I8
@@ -1,19 +1,4 @@
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
-
-if {
-        [string compare $os "Windows-64-VC8"] == 0
-    ||  [string compare $os "Windows-64-VC9"] == 0
-    ||  [string compare $os "Windows-64-VC10"] == 0
-   } {
-  puts "TODO OCC23068 $os: Error : Result shape is WRONG"
-} 
-
-if { [string compare $os "MacOS"] == 0 } {
-    puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG"
-}
+puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG"
 
 restore [locate_data_file offset_wire_103.brep] s
 
diff --git a/tests/offset/wire_closed_inside_0_025/H6 b/tests/offset/wire_closed_inside_0_025/H6
index f7745dbcb9..92e092a803 100644
--- a/tests/offset/wire_closed_inside_0_025/H6
+++ b/tests/offset/wire_closed_inside_0_025/H6
@@ -1,7 +1,7 @@
 puts "TODO OCC23748 ALL: Error : The offset cannot be built."
 puts "TODO OCC23748 Windows: Error: Offset is not done."
-puts "TODO OCC23748 Debian70-64: An exception was caught"
-puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*"
+puts "TODO OCC23748 Linux: An exception was caught"
+puts "TODO OCC23748 Linux: \\*\\* Exception \\*\\*"
 
 restore [locate_data_file offset_wire_092.brep] s
 
diff --git a/tests/offset/wire_closed_inside_0_025/I8 b/tests/offset/wire_closed_inside_0_025/I8
index 0724aa208a..37f5dfcd25 100644
--- a/tests/offset/wire_closed_inside_0_025/I8
+++ b/tests/offset/wire_closed_inside_0_025/I8
@@ -1,18 +1,4 @@
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
-
-if {
-        [string compare $os "Windows-64-VC8"] == 0
-    ||  [string compare $os "Windows-64-VC9"] == 0
-    ||  [string compare $os "Windows-64-VC10"] == 0
-   } {
-  puts "TODO OCC23068 $os: Error : Result shape is WRONG"
-}
-if { [string compare $os "MacOS"] == 0 } {
-    puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG"
-}
+puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG"
 
 restore [locate_data_file offset_wire_103.brep] s
 
diff --git a/tests/offset/wire_closed_inside_0_075/H6 b/tests/offset/wire_closed_inside_0_075/H6
index f7745dbcb9..92e092a803 100644
--- a/tests/offset/wire_closed_inside_0_075/H6
+++ b/tests/offset/wire_closed_inside_0_075/H6
@@ -1,7 +1,7 @@
 puts "TODO OCC23748 ALL: Error : The offset cannot be built."
 puts "TODO OCC23748 Windows: Error: Offset is not done."
-puts "TODO OCC23748 Debian70-64: An exception was caught"
-puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*"
+puts "TODO OCC23748 Linux: An exception was caught"
+puts "TODO OCC23748 Linux: \\*\\* Exception \\*\\*"
 
 restore [locate_data_file offset_wire_092.brep] s
 
diff --git a/tests/offset/wire_closed_inside_0_075/I8 b/tests/offset/wire_closed_inside_0_075/I8
index 55ab1b2b8e..dc1b681910 100644
--- a/tests/offset/wire_closed_inside_0_075/I8
+++ b/tests/offset/wire_closed_inside_0_075/I8
@@ -1,19 +1,4 @@
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
-
-if {
-        [string compare $os "Windows-64-VC8"] == 0
-    ||  [string compare $os "Windows-64-VC9"] == 0
-    ||  [string compare $os "Windows-64-VC10"] == 0
-   } {
-  puts "TODO OCC23068 $os: Error : Result shape is WRONG"
-} 
-
-if { [string compare $os "MacOS"] == 0 } {
-    puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG"
-}
+puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG"
 
 restore [locate_data_file offset_wire_103.brep] s
 
diff --git a/tests/offset/wire_closed_outside_0_005/C6 b/tests/offset/wire_closed_outside_0_005/C6
index 433e9bfb68..1e74ae2abe 100644
--- a/tests/offset/wire_closed_outside_0_005/C6
+++ b/tests/offset/wire_closed_outside_0_005/C6
@@ -1,15 +1,4 @@
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
-
-if {
-        [string compare $os "Mandriva2010"] != 0
-    &&  [string compare $os "Debian40"    ] != 0
-    &&  [string compare $os "Mandriva2008"] != 0
-   } {
-  puts "TODO OCC23068 $os: Faulty shapes in variables faulty_1 to faulty_2"
-}
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 restore [locate_data_file offset_wire_037.brep] s
 
diff --git a/tests/offset/wire_closed_outside_0_005/D1 b/tests/offset/wire_closed_outside_0_005/D1
index c91ddb5f30..1d8031ec5a 100644
--- a/tests/offset/wire_closed_outside_0_005/D1
+++ b/tests/offset/wire_closed_outside_0_005/D1
@@ -3,18 +3,7 @@
 #puts "TODO OCC24255 ALL: An exception was caught" 
 puts "TODO OCC24255 ALL: Error: Offset is not done."
 puts "TODO OCC24255 ALL: Error : The offset cannot be built."
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
-
-#if {
-#        [string compare $os "Mandriva2010"   ] != 0
-#    &&  [string compare $os "Debian40"       ] != 0
-#    &&  [string compare $os "Mandriva2008"   ] != 0
-#   } {
-#  puts "TODO OCC23068 $os: Error : The resulting shape is WRONG"
-#}
+#puts "TODO OCC23068 ALL: Error : The resulting shape is WRONG"
 
 restore [locate_data_file offset_wire_041.brep] s
 
diff --git a/tests/offset/wire_closed_outside_0_005/H6 b/tests/offset/wire_closed_outside_0_005/H6
index f7745dbcb9..92e092a803 100644
--- a/tests/offset/wire_closed_outside_0_005/H6
+++ b/tests/offset/wire_closed_outside_0_005/H6
@@ -1,7 +1,7 @@
 puts "TODO OCC23748 ALL: Error : The offset cannot be built."
 puts "TODO OCC23748 Windows: Error: Offset is not done."
-puts "TODO OCC23748 Debian70-64: An exception was caught"
-puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*"
+puts "TODO OCC23748 Linux: An exception was caught"
+puts "TODO OCC23748 Linux: \\*\\* Exception \\*\\*"
 
 restore [locate_data_file offset_wire_092.brep] s
 
diff --git a/tests/offset/wire_closed_outside_0_025/C6 b/tests/offset/wire_closed_outside_0_025/C6
index 9a57e513f7..757301b54f 100644
--- a/tests/offset/wire_closed_outside_0_025/C6
+++ b/tests/offset/wire_closed_outside_0_025/C6
@@ -1,16 +1,6 @@
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
-  
-if {
-	  [string compare $os "Mandriva2010"   ] != 0
-      &&  [string compare $os "Debian40"       ] != 0
-      &&  [string compare $os "Mandriva2008"   ] != 0
-   } {
-  puts "TODO OCC23068 $os: Faulty shapes in variables faulty_1 to faulty_2"
-  puts "TODO OCC23068 $os: Error : The resulting shape is WRONG"
-}
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
+puts "TODO OCC23068 ALL: Error : The resulting shape is WRONG"
+
 restore [locate_data_file offset_wire_037.brep] s
 
 set length 1105.94
diff --git a/tests/offset/wire_closed_outside_0_025/H6 b/tests/offset/wire_closed_outside_0_025/H6
index f7745dbcb9..92e092a803 100644
--- a/tests/offset/wire_closed_outside_0_025/H6
+++ b/tests/offset/wire_closed_outside_0_025/H6
@@ -1,7 +1,7 @@
 puts "TODO OCC23748 ALL: Error : The offset cannot be built."
 puts "TODO OCC23748 Windows: Error: Offset is not done."
-puts "TODO OCC23748 Debian70-64: An exception was caught"
-puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*"
+puts "TODO OCC23748 Linux: An exception was caught"
+puts "TODO OCC23748 Linux: \\*\\* Exception \\*\\*"
 
 restore [locate_data_file offset_wire_092.brep] s
 
diff --git a/tests/offset/wire_closed_outside_0_075/C6 b/tests/offset/wire_closed_outside_0_075/C6
index 62cfe1d4b4..ecd4f3e0c6 100644
--- a/tests/offset/wire_closed_outside_0_075/C6
+++ b/tests/offset/wire_closed_outside_0_075/C6
@@ -1,16 +1,6 @@
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
+puts "TODO OCC23068 ALL: Error : The resulting shape is WRONG"
 
-if {
-        [string compare $os "Mandriva2010"] != 0
-    &&  [string compare $os "Debian40"    ] != 0
-    &&  [string compare $os "Mandriva2008"] != 0
-   } {
-  puts "TODO OCC23068 $os: Faulty shapes in variables faulty_1 to faulty_2"
-  puts "TODO OCC23068 $os: Error : The resulting shape is WRONG"
-}
 restore [locate_data_file offset_wire_037.brep] s
 
 set length 1406.21
diff --git a/tests/offset/wire_closed_outside_0_075/H6 b/tests/offset/wire_closed_outside_0_075/H6
index f7745dbcb9..92e092a803 100644
--- a/tests/offset/wire_closed_outside_0_075/H6
+++ b/tests/offset/wire_closed_outside_0_075/H6
@@ -1,7 +1,7 @@
 puts "TODO OCC23748 ALL: Error : The offset cannot be built."
 puts "TODO OCC23748 Windows: Error: Offset is not done."
-puts "TODO OCC23748 Debian70-64: An exception was caught"
-puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*"
+puts "TODO OCC23748 Linux: An exception was caught"
+puts "TODO OCC23748 Linux: \\*\\* Exception \\*\\*"
 
 restore [locate_data_file offset_wire_092.brep] s
 
diff --git a/tests/offset/wire_closed_outside_0_075/I3 b/tests/offset/wire_closed_outside_0_075/I3
index 255cbd29b4..a543e03b7a 100644
--- a/tests/offset/wire_closed_outside_0_075/I3
+++ b/tests/offset/wire_closed_outside_0_075/I3
@@ -1,13 +1,3 @@
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
-
-if {
-        [string compare $os "Windows-32-VC8"] == 0
-   } {
-}
-
 restore [locate_data_file offset_wire_098.brep] s
 
 set length 332.67
diff --git a/tests/offset/wire_unclosed_outside_0_005/A1 b/tests/offset/wire_unclosed_outside_0_005/A1
index 93baafb81d..6b3e7626d2 100644
--- a/tests/offset/wire_unclosed_outside_0_005/A1
+++ b/tests/offset/wire_unclosed_outside_0_005/A1
@@ -1,15 +1,4 @@
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
-
-if {
-        [string compare $os "Mandriva2010"] != 0
-    &&  [string compare $os "Debian40"    ] != 0
-    &&  [string compare $os "Mandriva2008"] != 0
-   } {
-  puts "TODO OCC23068 $os: Error : The resulting shape is WRONG"
-}
+puts "TODO OCC23068 ALL: Error : The resulting shape is WRONG"
 
 restore [locate_data_file offset_wire_001.brep] s
 set length 8.78837
diff --git a/tests/offset/wire_unclosed_outside_0_005/B8 b/tests/offset/wire_unclosed_outside_0_005/B8
index 1b114602af..8118c5aec9 100644
--- a/tests/offset/wire_unclosed_outside_0_005/B8
+++ b/tests/offset/wire_unclosed_outside_0_005/B8
@@ -1,16 +1,5 @@
 puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
-set os "ALL"
-if {[array get env os_type] != ""} {
-  set os $env(os_type)
-}
-
-if {
-        [string compare $os "Mandriva2010"] != 0
-    &&  [string compare $os "Debian40"    ] != 0
-    &&  [string compare $os "Mandriva2008"] != 0
-   } {
-  puts "TODO OCC23068 $os: Error : big tolerance of shape result"
-}
+puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
 
 restore [locate_data_file offset_wire_070.brep] s
 
diff --git a/tests/xml/begin b/tests/xml/begin
index f5cc9f73cc..840942ae81 100755
--- a/tests/xml/begin
+++ b/tests/xml/begin
@@ -22,12 +22,8 @@ if { [info exists test_image ] == 0 } {
 
 set WorkDirectory $imagedir
 
-set os "ALL"
-if {[array get env os_type] != ""} {
-    set os $env(os_type)
-}
-
-if { [regexp "indows" $os] } {
+set env(os_type) $tcl_platform(platform)
+if { [regexp "indows" $env(os_type)] } {
     if {[regexp -nocase {jdk} $env(PATH)] || [regexp -nocase {java} $env(PATH)]} {
 	set Java "java"
     } else {