From 3a16ffe40e658b3d40d9b10479dc544e0c060a6e Mon Sep 17 00:00:00 2001
From: cgf <cgf>
Date: Tue, 18 Jul 2006 03:24:07 +0000
Subject: [PATCH] * Makefile.in: Simplify a little.

---
 winsup/testsuite/ChangeLog   |  4 ++++
 winsup/testsuite/Makefile.in | 12 ++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index 8e8cdda2cf..f5b244a074 100644
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-17  Christopher Faylor  <cgf@timesys.com>
+
+	* Makefile.in: Simplify a little.
+
 2006-06-12  Pierre Humblet  Pierre.Humblet@ieee.org
 
 	* winsup.api/user_malloc.c: New file.
diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in
index 70bf30c8bc..fc76e9caea 100644
--- a/winsup/testsuite/Makefile.in
+++ b/winsup/testsuite/Makefile.in
@@ -75,14 +75,6 @@ export CC
 
 INSTALL_DATA:=$(SHELL) $(updir1)/install-sh -c
 
-# Setup the testing framework, if you have one
-EXPECT = `if [ -f $${rootme}/../../expect/expect$(EXEEXT) ] ; then \
-            echo $${rootme}/../../expect/expect$(EXEEXT) ; \
-          else echo expect ; fi`
-
-RUNTEST = `if [ -f ${srcdir}/../../dejagnu/runtest ] ; then \
-	       echo ${srcdir}/../../dejagnu/runtest ; \
-	    else echo runtest; fi`
 RUNTESTFLAGS =
 
 ifdef VERBOSE
@@ -181,12 +173,12 @@ testsuite/site.exp: site.exp
 
 check: $(TESTSUP_LIB_NAME) $(RUNTIME) cygrun.exe testsuite/site.exp
 	cd testsuite; \
-	EXPECT=${EXPECT} ; export EXPECT ; \
+	export EXPECT=expect ; \
 	if [ -f $(bupdir2)/expect/expect ] ; then  \
 	   TCL_LIBRARY=`cd .. ; cd ${srcdir}/../../tcl/library ; pwd` ; \
 	    export TCL_LIBRARY ; fi ; \
 	PATH=$(bupdir)/cygwin:$${PATH} ;\
-	$(RUNTEST) --tool winsup $(RUNTESTFLAGS) ;\
+	runtest --tool winsup $(RUNTESTFLAGS) ;\
 
 cygrun.o: cygrun.c
 	$(CC) $(MINGW_CFLAGS) -o $@ -c $<
-- 
2.11.0