Merge commit 'whot/master' into master

I decided to keep the Xproto renaming I had, which restored the original
names with the p prefix.

Conflicts:
	xts5/scenarios/Xproto_scen
	xts5/tet_scen
	xts5/tset/Xproto/.gitignore
	xts5/tset/Xproto/AllocColorCells/AllocColorCells.m
	...

21 files changed, 66 insertions, 26 deletions

diff --git a/xts5/Makefile.am b/xts5/Makefile.am
index f18d5896..53c51e39 100644
--- a/xts5/Makefile.am
+++ b/xts5/Makefile.am
@@ -1,8 +1,9 @@
 include common.mk
 
-SUBDIRS = . src fonts tset
+SUBDIRS = . src fonts tset scenarios
 
-check_DATA = tetexec.cfg
+xts5_DATA = tetexec.cfg tet_scen
+xts5dir = $(datadir)/xts5
 
 XTS_CONFIG = TET_ROOT='$(TET_ROOT)' DISPLAY='$(XT_DISPLAY)' \
 	XSET='$(XSET)' XDPYINFO='$(XDPYINFO)' \
diff --git a/xts5/scenarios/Makefile.am b/xts5/scenarios/Makefile.am
new file mode 100644
index 00000000..e9fdb672
--- /dev/null
+++ b/xts5/scenarios/Makefile.am
@@ -0,0 +1,39 @@
+include ../common.mk
+
+scenarios_DATA = \
+		shape_scen \
+		XIproto_scen \
+		XI_scen \
+		Xlib10_scen \
+		Xlib11_scen \
+		Xlib12_scen \
+		Xlib13_scen \
+		Xlib14_scen \
+		Xlib15_scen \
+		Xlib16_scen \
+		Xlib17_scen \
+		Xlib3_scen \
+		Xlib4_scen \
+		Xlib5_scen \
+		Xlib6_scen \
+		Xlib7_scen \
+		Xlib8_scen \
+		Xlib9_scen \
+		Xopen_scen \
+		Xproto_scen \
+		Xt10_scen \
+		Xt11_scen \
+		Xt12_scen \
+		Xt13_scen \
+		Xt14_scen \
+		Xt15_scen \
+		Xt3_scen \
+		Xt4_scen \
+		Xt5_scen \
+		Xt6_scen \
+		Xt7_scen \
+		Xt8_scen \
+		Xt9_scen \
+		XtC_scen \
+		XtE_scen
+scenariosdir = $(datadir)/xts5/scenarios
diff --git a/xts5/tset/XI/Makefile.am b/xts5/tset/XI/Makefile.am
index d0573332..ff984fb5 100644
--- a/xts5/tset/XI/Makefile.am
+++ b/xts5/tset/XI/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/XIproto/Makefile.am b/xts5/tset/XIproto/Makefile.am
index cce00c50..2c91bf29 100644
--- a/xts5/tset/XIproto/Makefile.am
+++ b/xts5/tset/XIproto/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XP_LCFLAGS) $(XP_CFLAGS)
 LDADD = $(TCM) $(XP_LLIBS) $(XP_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xlib10/Makefile.am b/xts5/tset/Xlib10/Makefile.am
index a6a98a6d..ec98940c 100644
--- a/xts5/tset/Xlib10/Makefile.am
+++ b/xts5/tset/Xlib10/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xlib11/Makefile.am b/xts5/tset/Xlib11/Makefile.am
index c037084b..b0168c6a 100644
--- a/xts5/tset/Xlib11/Makefile.am
+++ b/xts5/tset/Xlib11/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xlib12/Makefile.am b/xts5/tset/Xlib12/Makefile.am
index 32983ec0..130ffb4c 100644
--- a/xts5/tset/Xlib12/Makefile.am
+++ b/xts5/tset/Xlib12/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -38,5 +38,5 @@ tprogs = \
 	XWindowEvent/XWindowEvent
 
 # Auxiliary programs run from tests
-check_PROGRAMS += XDisplayName/Test1
+libexec_PROGRAMS += XDisplayName/Test1
 XDisplayName_Test1_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS)
diff --git a/xts5/tset/Xlib13/Makefile.am b/xts5/tset/Xlib13/Makefile.am
index 7681a572..b3157610 100644
--- a/xts5/tset/Xlib13/Makefile.am
+++ b/xts5/tset/Xlib13/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xlib14/Makefile.am b/xts5/tset/Xlib14/Makefile.am
index b7cc06cb..37618c27 100644
--- a/xts5/tset/Xlib14/Makefile.am
+++ b/xts5/tset/Xlib14/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) \
 	$(top_builddir)/xts5/src/libXR5/libXR5.a
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xlib15/Makefile.am b/xts5/tset/Xlib15/Makefile.am
index 5dd799d1..c557b1ee 100644
--- a/xts5/tset/Xlib15/Makefile.am
+++ b/xts5/tset/Xlib15/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -58,7 +58,7 @@ tprogs = \
 	XWithdrawWindow/XWithdrawWindow
 
 # Auxiliary programs run from tests
-check_PROGRAMS += \
+libexec_PROGRAMS += \
 	XSetWMProperties/Test1 \
 	XSetWMProperties/Test2
 XSetWMProperties_Test1_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS)
diff --git a/xts5/tset/Xlib16/Makefile.am b/xts5/tset/Xlib16/Makefile.am
index 998a0036..040c2863 100644
--- a/xts5/tset/Xlib16/Makefile.am
+++ b/xts5/tset/Xlib16/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xlib17/Makefile.am b/xts5/tset/Xlib17/Makefile.am
index 3808e665..fd0531cb 100644
--- a/xts5/tset/Xlib17/Makefile.am
+++ b/xts5/tset/Xlib17/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -66,7 +66,7 @@ tprogs = \
 	XXorRegion/XXorRegion
 
 # Auxiliary programs run from tests
-check_PROGRAMS += \
+libexec_PROGRAMS += \
 	XGetDefault/Test3 \
 	XGetDefault/Test4 \
 	XGetDefault/Test5
diff --git a/xts5/tset/Xlib3/Makefile.am b/xts5/tset/Xlib3/Makefile.am
index ec537aa6..c36cd73a 100644
--- a/xts5/tset/Xlib3/Makefile.am
+++ b/xts5/tset/Xlib3/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -70,7 +70,7 @@ tprogs = XAllPlanes/XAllPlanes \
 	XWhitePixelOfScreen/XWhitePixelOfScreen XWhitePixelOfScreen/XWhitePixelOfScreen_m
 
 # Auxiliary programs run from tests
-check_PROGRAMS += \
+libexec_PROGRAMS += \
 	XDisplayString/Test1 \
 	XOpenDisplay/Test1
 XDisplayString_Test1_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS)
diff --git a/xts5/tset/Xlib4/Makefile.am b/xts5/tset/Xlib4/Makefile.am
index d5078a8f..9758c5d2 100644
--- a/xts5/tset/Xlib4/Makefile.am
+++ b/xts5/tset/Xlib4/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xlib5/Makefile.am b/xts5/tset/Xlib5/Makefile.am
index 8ae8ae43..9931325b 100644
--- a/xts5/tset/Xlib5/Makefile.am
+++ b/xts5/tset/Xlib5/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xlib6/Makefile.am b/xts5/tset/Xlib6/Makefile.am
index aa61f62d..5a229aed 100644
--- a/xts5/tset/Xlib6/Makefile.am
+++ b/xts5/tset/Xlib6/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xlib7/Makefile.am b/xts5/tset/Xlib7/Makefile.am
index 95811ad3..57351e27 100644
--- a/xts5/tset/Xlib7/Makefile.am
+++ b/xts5/tset/Xlib7/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) \
 	$(top_builddir)/xts5/src/libXR5/libXR5.a
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xlib8/Makefile.am b/xts5/tset/Xlib8/Makefile.am
index 6b05d12b..8fe5a345 100644
--- a/xts5/tset/Xlib8/Makefile.am
+++ b/xts5/tset/Xlib8/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xlib9/Makefile.am b/xts5/tset/Xlib9/Makefile.am
index d87d7e2d..b27329ef 100644
--- a/xts5/tset/Xlib9/Makefile.am
+++ b/xts5/tset/Xlib9/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xopen/Makefile.am b/xts5/tset/Xopen/Makefile.am
index 3012fe29..45e22d40 100644
--- a/xts5/tset/Xopen/Makefile.am
+++ b/xts5/tset/Xopen/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-check_PROGRAMS = $(tprogs)
+libexec_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/tset/Xproto/pAllocColor/pAllocColor.m b/xts5/tset/Xproto/pAllocColor/pAllocColor.m
index 41e28e6c..9cb746a2 100644
--- a/xts5/tset/Xproto/pAllocColor/pAllocColor.m
+++ b/xts5/tset/Xproto/pAllocColor/pAllocColor.m
@@ -17,14 +17,14 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-$Header: /cvs/xtest/xtest/xts5/tset/Xproto/XAllocColor/XAllocColor.m,v 1.2 2005-11-03 08:44:01 jmichael Exp $
+$Header: /cvs/xtest/xtest/xts5/tset/Xproto/AllocColor/AllocColor.m,v 1.2 2005-11-03 08:44:01 jmichael Exp $
 
 Copyright (c) Applied Testing and Technology, Inc. 1995
 All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/tset/Xproto/XAllocColor/XAllocColor.m
+>># File: xts5/tset/Xproto/AllocColor/AllocColor.m
 >># 
 >># Description:
 >># 	Tests for AllocColor