diff options
| author | Christopher Faylor <me@cgf.cx> | 2006-07-18 07:24:07 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2006-07-18 07:24:07 +0400 |
| commit | e2213b70dd46f1d1ab962e41626915d7ba9571c5 (patch) | |
| tree | 49784da5b167db15e8b7406a1928d0bd36575bd7 /winsup/testsuite | |
| parent | f62412f235c387d46e192244db43ce62d9a9e7be (diff) | |
* Makefile.in: Simplify a little.
Diffstat (limited to 'winsup/testsuite')
| -rw-r--r-- | winsup/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/testsuite/Makefile.in | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog index 8e8cdda2c..f5b244a07 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 70bf30c8b..fc76e9cae 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 $< |