xts5: Flatten Xt7 directory more

13 files changed, 33 insertions, 33 deletions

diff --git a/xts5/Xt7/XtCallbackExclusive/XtCallbackExclusive.m b/xts5/Xt7/XtCallbackExclusive.m
index 6871207e..b57ddc77 100644
--- a/xts5/Xt7/XtCallbackExclusive/XtCallbackExclusive.m
+++ b/xts5/Xt7/XtCallbackExclusive.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt7/XtCallbackExclusive/XtCallbackExclusive.m
+>># File: xts/Xt7/XtCallbackExclusive.m
 >># 
 >># Description:
 >>#	Tests for XtCallbackExclusive()
diff --git a/xts5/Xt7/XtCallbackNone/XtCallbackNone.m b/xts5/Xt7/XtCallbackNone.m
index 9cd62b24..59179e62 100644
--- a/xts5/Xt7/XtCallbackNone/XtCallbackNone.m
+++ b/xts5/Xt7/XtCallbackNone.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt7/XtCallbackNone/XtCallbackNone.m
+>># File: xts/Xt7/XtCallbackNone.m
 >># 
 >># Description:
 >>#	Tests for XtCallbackNone()
diff --git a/xts5/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive.m b/xts5/Xt7/XtCallbackNonexclusive.m
index 9528aaee..7c38d3e0 100644
--- a/xts5/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive.m
+++ b/xts5/Xt7/XtCallbackNonexclusive.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive.m
+>># File: xts/Xt7/XtCallbackNonexclusive.m
 >># 
 >># Description:
 >>#	Tests for XtCallbackNonexclusive()
diff --git a/xts5/Xt7/XtCallbackPopdown/XtCallbackPopdown.m b/xts5/Xt7/XtCallbackPopdown.m
index 04d040ce..3d2b2b66 100644
--- a/xts5/Xt7/XtCallbackPopdown/XtCallbackPopdown.m
+++ b/xts5/Xt7/XtCallbackPopdown.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt7/XtCallbackPopdown/XtCallbackPopdown.m
+>># File: xts/Xt7/XtCallbackPopdown.m
 >># 
 >># Description:
 >>#	Tests for XtCallbackPopdown()
diff --git a/xts5/Xt7/XtCreatePopupShell/XtCreatePopupShell.m b/xts5/Xt7/XtCreatePopupShell.m
index bf8f49d6..2434c2f9 100644
--- a/xts5/Xt7/XtCreatePopupShell/XtCreatePopupShell.m
+++ b/xts5/Xt7/XtCreatePopupShell.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt7/XtCreatePopupShell/XtCreatePopupShell.m
+>># File: xts/Xt7/XtCreatePopupShell.m
 >># 
 >># Description:
 >>#	Tests for XtCreatePopupShell()
diff --git a/xts5/Xt7/XtMenuPopdown/XtMenuPopdown.m b/xts5/Xt7/XtMenuPopdown.m
index 877a3266..35baebbd 100644
--- a/xts5/Xt7/XtMenuPopdown/XtMenuPopdown.m
+++ b/xts5/Xt7/XtMenuPopdown.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt7/XtMenuPopdown/XtMenuPopdown.m
+>># File: xts/Xt7/XtMenuPopdown.m
 >># 
 >># Description:
 >>#	Tests for XtMenuPopdown()
diff --git a/xts5/Xt7/XtMenuPopup/XtMenuPopup.m b/xts5/Xt7/XtMenuPopup.m
index e165700b..10e1411e 100644
--- a/xts5/Xt7/XtMenuPopup/XtMenuPopup.m
+++ b/xts5/Xt7/XtMenuPopup.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt7/XtMenuPopup/XtMenuPopup.m
+>># File: xts/Xt7/XtMenuPopup.m
 >># 
 >># Description:
 >>#	Tests for XtMenuPopup()
diff --git a/xts5/Xt7/XtPopdown/XtPopdown.m b/xts5/Xt7/XtPopdown.m
index 0ace3c72..fccd8012 100644
--- a/xts5/Xt7/XtPopdown/XtPopdown.m
+++ b/xts5/Xt7/XtPopdown.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt7/XtPopdown/XtPopdown.m
+>># File: xts/Xt7/XtPopdown.m
 >># 
 >># Description:
 >>#	Tests for XtPopdown()
diff --git a/xts5/Xt7/XtPopup/XtPopup.m b/xts5/Xt7/XtPopup.m
index c3e3bc3a..8015186d 100644
--- a/xts5/Xt7/XtPopup/XtPopup.m
+++ b/xts5/Xt7/XtPopup.m
@@ -26,7 +26,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt7/XtPopup/XtPopup.m
+>># File: xts/Xt7/XtPopup.m
 >># 
 >># Description:
 >>#	Tests for XtPopup()
diff --git a/xts5/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded.m b/xts5/Xt7/XtPopupSpringLoaded.m
index 0d8fd7d5..45778fd4 100644
--- a/xts5/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded.m
+++ b/xts5/Xt7/XtPopupSpringLoaded.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded.m
+>># File: xts/Xt7/XtPopupSpringLoaded.m
 >># 
 >># Description:
 >>#	Tests for XtPopupSpringLoaded()
diff --git a/xts5/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell.m b/xts5/Xt7/XtVaCreatePopupShell.m
index 1cc12fc3..23946976 100644
--- a/xts5/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell.m
+++ b/xts5/Xt7/XtVaCreatePopupShell.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell.m
+>># File: xts/Xt7/XtVaCreatePopupShell.m
 >># 
 >># Description:
 >>#	Tests for XtVaCreatePopupShell()
diff --git a/xts5/scenarios/Xt7_scen b/xts5/scenarios/Xt7_scen
index 84c25b5f..d0743d89 100644
--- a/xts5/scenarios/Xt7_scen
+++ b/xts5/scenarios/Xt7_scen
@@ -58,24 +58,24 @@
 #
 
 	"VSW5TESTSUITE CASE XtCreatePopupShell 6"
-	/Xt7/XtCreatePopupShell/XtCreatePopupShell
+	/Xt7/XtCreatePopupShell
 	"VSW5TESTSUITE CASE XtVaCreatePopupShell 6"
-	/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell
+	/Xt7/XtVaCreatePopupShell
 	"VSW5TESTSUITE CASE XtPopup 11"
-	/Xt7/XtPopup/XtPopup
+	/Xt7/XtPopup
 	"VSW5TESTSUITE CASE XtPopdown 8"
-	/Xt7/XtPopdown/XtPopdown
+	/Xt7/XtPopdown
 	"VSW5TESTSUITE CASE XtPopupSpringLoaded 9"
-	/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded
+	/Xt7/XtPopupSpringLoaded
 	"VSW5TESTSUITE CASE XtCallbackNone 8"
-	/Xt7/XtCallbackNone/XtCallbackNone
+	/Xt7/XtCallbackNone
 	"VSW5TESTSUITE CASE XtCallbackNonexclusive 8"
-	/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive
+	/Xt7/XtCallbackNonexclusive
 	"VSW5TESTSUITE CASE XtCallbackExclusive 8"
-	/Xt7/XtCallbackExclusive/XtCallbackExclusive
+	/Xt7/XtCallbackExclusive
 	"VSW5TESTSUITE CASE XtMenuPopup 22"
-	/Xt7/XtMenuPopup/XtMenuPopup
+	/Xt7/XtMenuPopup
 	"VSW5TESTSUITE CASE XtCallbackPopdown 9"
-	/Xt7/XtCallbackPopdown/XtCallbackPopdown
+	/Xt7/XtCallbackPopdown
 	"VSW5TESTSUITE CASE XtMenuPopdown 11"
-	/Xt7/XtMenuPopdown/XtMenuPopdown
+	/Xt7/XtMenuPopdown
diff --git a/xts5/tet_scen b/xts5/tet_scen
index 85be8af2..a748d3df 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -3886,47 +3886,47 @@ ApplicationShellWidget
 
 XtCreatePopupShell
 	"VSW5TESTSUITE CASE XtCreatePopupShell 8"
-	/Xt7/XtCreatePopupShell/XtCreatePopupShell
+	/Xt7/XtCreatePopupShell
 
 XtVaCreatePopupShell
 	"VSW5TESTSUITE CASE XtVaCreatePopupShell 8"
-	/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell
+	/Xt7/XtVaCreatePopupShell
 
 XtPopup
 	"VSW5TESTSUITE CASE XtPopup 11"
-	/Xt7/XtPopup/XtPopup
+	/Xt7/XtPopup
 
 XtPopdown
 	"VSW5TESTSUITE CASE XtPopdown 8"
-	/Xt7/XtPopdown/XtPopdown
+	/Xt7/XtPopdown
 
 XtPopupSpringLoaded
 	"VSW5TESTSUITE CASE XtPopupSpringLoaded 9"
-	/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded
+	/Xt7/XtPopupSpringLoaded
 
 XtCallbackNone
 	"VSW5TESTSUITE CASE XtCallbackNone 8"
-	/Xt7/XtCallbackNone/XtCallbackNone
+	/Xt7/XtCallbackNone
 
 XtCallbackNonexclusive
 	"VSW5TESTSUITE CASE XtCallbackNonexclusive 8"
-	/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive
+	/Xt7/XtCallbackNonexclusive
 
 XtCallbackExclusive
 	"VSW5TESTSUITE CASE XtCallbackExclusive 8"
-	/Xt7/XtCallbackExclusive/XtCallbackExclusive
+	/Xt7/XtCallbackExclusive
 
 XtMenuPopup
 	"VSW5TESTSUITE CASE XtMenuPopup 22"
-	/Xt7/XtMenuPopup/XtMenuPopup
+	/Xt7/XtMenuPopup
 
 XtCallbackPopdown
 	"VSW5TESTSUITE CASE XtCallbackPopdown 9"
-	/Xt7/XtCallbackPopdown/XtCallbackPopdown
+	/Xt7/XtCallbackPopdown
 
 XtMenuPopdown
 	"VSW5TESTSUITE CASE XtMenuPopdown 11"
-	/Xt7/XtMenuPopdown/XtMenuPopdown
+	/Xt7/XtMenuPopdown
 
 #Discrete tests for Xt Chapter 8