xts5: Flatten SHAPE directory more

13 files changed, 33 insertions, 33 deletions

diff --git a/xts5/SHAPE/XShapeCombineMask/XShapeCombineMask.m b/xts5/SHAPE/XShapeCombineMask.m
index 63c6f140..4676643e 100644
--- a/xts5/SHAPE/XShapeCombineMask/XShapeCombineMask.m
+++ b/xts5/SHAPE/XShapeCombineMask.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/SHAPE/XShapeCombineMask/XShapeCombineMask.m
+>># File: xts/SHAPE/XShapeCombineMask.m
 >>#
 >># Description:
 >>#     Tests for XShapeCombineMask()
diff --git a/xts5/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles.m b/xts5/SHAPE/XShapeCombineRectangles.m
index 8464cd4a..f86f54cf 100644
--- a/xts5/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles.m
+++ b/xts5/SHAPE/XShapeCombineRectangles.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles.m
+>># File: xts/SHAPE/XShapeCombineRectangles.m
 >>#
 >># Description:
 >>#     Tests for XShapeCombineRectangles()
diff --git a/xts5/SHAPE/XShapeCombineRegion/XShapeCombineRegion.m b/xts5/SHAPE/XShapeCombineRegion.m
index 10161ede..c5d37fb1 100644
--- a/xts5/SHAPE/XShapeCombineRegion/XShapeCombineRegion.m
+++ b/xts5/SHAPE/XShapeCombineRegion.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/SHAPE/XShapeCombineRegion/XShapeCombineRegion.m
+>># File: xts/SHAPE/XShapeCombineRegion.m
 >>#
 >># Description:
 >>#     Tests for XShapeCombineRegion()
diff --git a/xts5/SHAPE/XShapeCombineShape/XShapeCombineShape.m b/xts5/SHAPE/XShapeCombineShape.m
index 798e1123..ddd16173 100644
--- a/xts5/SHAPE/XShapeCombineShape/XShapeCombineShape.m
+++ b/xts5/SHAPE/XShapeCombineShape.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/SHAPE/XShapeCombineShape/XShapeCombineShape.m
+>># File: xts/SHAPE/XShapeCombineShape.m
 >>#
 >># Description:
 >>#     Tests for XShapeCombineShape()
diff --git a/xts5/SHAPE/XShapeGetRectangles/XShapeGetRectangles.m b/xts5/SHAPE/XShapeGetRectangles.m
index 408711a6..661325d0 100644
--- a/xts5/SHAPE/XShapeGetRectangles/XShapeGetRectangles.m
+++ b/xts5/SHAPE/XShapeGetRectangles.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/SHAPE/XShapeGetRectangles/XShapeGetRectangles.m
+>># File: xts/SHAPE/XShapeGetRectangles.m
 >>#
 >># Description:
 >>#     Tests for XShapeGetRectangles()
diff --git a/xts5/SHAPE/XShapeInputSelected/XShapeInputSelected.m b/xts5/SHAPE/XShapeInputSelected.m
index 20fd47d4..204cb0e4 100644
--- a/xts5/SHAPE/XShapeInputSelected/XShapeInputSelected.m
+++ b/xts5/SHAPE/XShapeInputSelected.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/SHAPE/XShapeOffsetShape/tshpinsel.m
+>># File: xts/SHAPE/tshpinsel.m
 >>#
 >># Description:
 >>#     Tests for XShapeInputSelected()
diff --git a/xts5/SHAPE/XShapeOffsetShape/XShapeOffsetShape.m b/xts5/SHAPE/XShapeOffsetShape.m
index f3eb8c40..36d576d7 100644
--- a/xts5/SHAPE/XShapeOffsetShape/XShapeOffsetShape.m
+++ b/xts5/SHAPE/XShapeOffsetShape.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/SHAPE/XShapeOffsetShape/XShapeOffsetShape.m
+>># File: xts/SHAPE/XShapeOffsetShape.m
 >>#
 >># Description:
 >>#     Tests for XShapeOffsetShape()
diff --git a/xts5/SHAPE/XShapeQueryExtension/XShapeQueryExtension.m b/xts5/SHAPE/XShapeQueryExtension.m
index 54bcf9ed..eb359494 100644
--- a/xts5/SHAPE/XShapeQueryExtension/XShapeQueryExtension.m
+++ b/xts5/SHAPE/XShapeQueryExtension.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/SHAPE/XShapeQueryExtension/XShapeQueryExtension.m
+>># File: xts/SHAPE/XShapeQueryExtension.m
 >>#
 >># Description:
 >>#     Tests for XShapeQueryExtension()
diff --git a/xts5/SHAPE/XShapeQueryExtents/XShapeQueryExtents.m b/xts5/SHAPE/XShapeQueryExtents.m
index aaefa66d..dccac861 100644
--- a/xts5/SHAPE/XShapeQueryExtents/XShapeQueryExtents.m
+++ b/xts5/SHAPE/XShapeQueryExtents.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/SHAPE/XShapeQueryExtents/XShapeQueryExtents.m
+>># File: xts/SHAPE/XShapeQueryExtents.m
 >>#
 >># Description:
 >>#     Tests for XShapeQueryExtents()
diff --git a/xts5/SHAPE/XShapeQueryVersion/XShapeQueryVersion.m b/xts5/SHAPE/XShapeQueryVersion.m
index 0861e7e4..5870745e 100644
--- a/xts5/SHAPE/XShapeQueryVersion/XShapeQueryVersion.m
+++ b/xts5/SHAPE/XShapeQueryVersion.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/SHAPE/XShapeQueryVersion/XShapeQueryVersion.m
+>># File: xts/SHAPE/XShapeQueryVersion.m
 >>#
 >># Description:
 >>#     Tests for XShapeQueryVersion()
diff --git a/xts5/SHAPE/XShapeSelectInput/XShapeSelectInput.m b/xts5/SHAPE/XShapeSelectInput.m
index 3215d57e..5ec3cc3b 100644
--- a/xts5/SHAPE/XShapeSelectInput/XShapeSelectInput.m
+++ b/xts5/SHAPE/XShapeSelectInput.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/SHAPE/XShapeSelectInput/XShapeSelectInput.m
+>># File: xts/SHAPE/XShapeSelectInput.m
 >>#
 >># Description:
 >>#     Tests for XShapeSelectInput()
diff --git a/xts5/scenarios/shape_scen b/xts5/scenarios/shape_scen
index 5979a566..551683d9 100644
--- a/xts5/scenarios/shape_scen
+++ b/xts5/scenarios/shape_scen
@@ -61,24 +61,24 @@
 #
 
 	"VSW5TESTSUITE CASE XShapeOffsetShape 1"
-	/SHAPE/XShapeOffsetShape/XShapeOffsetShape
+	/SHAPE/XShapeOffsetShape
 	"VSW5TESTSUITE CASE XShapeCombineMask 1"
-	/SHAPE/XShapeCombineMask/XShapeCombineMask
+	/SHAPE/XShapeCombineMask
 	"VSW5TESTSUITE CASE XShapeCombineRectangles 1"
-	/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles
+	/SHAPE/XShapeCombineRectangles
 	"VSW5TESTSUITE CASE XShapeCombineRegion 1"
-	/SHAPE/XShapeCombineRegion/XShapeCombineRegion
+	/SHAPE/XShapeCombineRegion
 	"VSW5TESTSUITE CASE XShapeCombineShape 1"
-	/SHAPE/XShapeCombineShape/XShapeCombineShape
+	/SHAPE/XShapeCombineShape
 	"VSW5TESTSUITE CASE XShapeGetRectangles 1"
-	/SHAPE/XShapeGetRectangles/XShapeGetRectangles
+	/SHAPE/XShapeGetRectangles
 	"VSW5TESTSUITE CASE XShapeInputSelected 1"
-	/SHAPE/XShapeInputSelected/XShapeInputSelected
+	/SHAPE/XShapeInputSelected
 	"VSW5TESTSUITE CASE XShapeQueryExtension 1"
-	/SHAPE/XShapeQueryExtension/XShapeQueryExtension
+	/SHAPE/XShapeQueryExtension
 	"VSW5TESTSUITE CASE XShapeQueryExtents 1"
-	/SHAPE/XShapeQueryExtents/XShapeQueryExtents
+	/SHAPE/XShapeQueryExtents
 	"VSW5TESTSUITE CASE XShapeQueryVersion 1"
-	/SHAPE/XShapeQueryVersion/XShapeQueryVersion
+	/SHAPE/XShapeQueryVersion
 	"VSW5TESTSUITE CASE XShapeSelectInput 1"
-	/SHAPE/XShapeSelectInput/XShapeSelectInput
+	/SHAPE/XShapeSelectInput
diff --git a/xts5/tet_scen b/xts5/tet_scen
index c13170d3..b39cb381 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -646,47 +646,47 @@ XUngrabDeviceKey
 
 XShapeOffsetShape
 	"VSW5TESTSUITE CASE XShapeOffsetShape 1"
-	/SHAPE/XShapeOffsetShape/XShapeOffsetShape
+	/SHAPE/XShapeOffsetShape
 
 XShapeCombineMask
 	"VSW5TESTSUITE CASE XShapeCombineMask 1"
-	/SHAPE/XShapeCombineMask/XShapeCombineMask
+	/SHAPE/XShapeCombineMask
 
 XShapeCombineRectangles
 	"VSW5TESTSUITE CASE XShapeCombineRectangles 1"
-	/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles
+	/SHAPE/XShapeCombineRectangles
 
 XShapeCombineRegion
 	"VSW5TESTSUITE CASE XShapeCombineRegion 1"
-	/SHAPE/XShapeCombineRegion/XShapeCombineRegion
+	/SHAPE/XShapeCombineRegion
 
 XShapeCombineShape
 	"VSW5TESTSUITE CASE XShapeCombineShape 1"
-	/SHAPE/XShapeCombineShape/XShapeCombineShape
+	/SHAPE/XShapeCombineShape
 
 XShapeGetRectangles
 	"VSW5TESTSUITE CASE XShapeGetRectangles 1"
-	/SHAPE/XShapeGetRectangles/XShapeGetRectangles
+	/SHAPE/XShapeGetRectangles
 
 XShapeInputSelected
 	"VSW5TESTSUITE CASE XShapeInputSelected 1"
-	/SHAPE/XShapeInputSelected/XShapeInputSelected
+	/SHAPE/XShapeInputSelected
 
 XShapeQueryExtension
 	"VSW5TESTSUITE CASE XShapeQueryExtension 1"
-	/SHAPE/XShapeQueryExtension/XShapeQueryExtension
+	/SHAPE/XShapeQueryExtension
 
 XShapeQueryExtents
 	"VSW5TESTSUITE CASE XShapeQueryExtents 1"
-	/SHAPE/XShapeQueryExtents/XShapeQueryExtents
+	/SHAPE/XShapeQueryExtents
 
 XShapeQueryVersion
 	"VSW5TESTSUITE CASE XShapeQueryVersion 1"
-	/SHAPE/XShapeQueryVersion/XShapeQueryVersion
+	/SHAPE/XShapeQueryVersion
 
 XShapeSelectInput
 	"VSW5TESTSUITE CASE XShapeSelectInput 1"
-	/SHAPE/XShapeSelectInput/XShapeSelectInput
+	/SHAPE/XShapeSelectInput
 
 # Discrete tests for Xlib Chapter 10-Window and Session Manager Functions