From 9d89f63486e9294714f900f9f98f5a4454a40a7e Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 26 Aug 2002 02:53:24 +0000
Subject: [PATCH] * Makefile.in (RUNTEST): Use Makefile's srcdir and bupdir*
 macros, where appropriate. * winsup.api/winsup.exp: Use -nodefaultlibs when
 linking executable to avoid potentially linking installed dll.

---
 winsup/testsuite/ChangeLog             |  7 +++++++
 winsup/testsuite/Makefile.in           | 10 ++++------
 winsup/testsuite/winsup.api/winsup.exp |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index 424e924a1..9c9770251 100644
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-25  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.in (RUNTEST): Use Makefile's srcdir and bupdir* macros,
+	where appropriate.
+	* winsup.api/winsup.exp: Use -nodefaultlibs when linking executable to
+	avoid potentially linking installed dll.
+
 2002-07-06  Christopher Faylor  <cgf@redhat.com>
 
 	* testsuite/winsup.api/winsup.exp: Add -mwin32 to gcc flags so
diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in
index dd4abe4a3..1658c362d 100644
--- a/winsup/testsuite/Makefile.in
+++ b/winsup/testsuite/Makefile.in
@@ -78,8 +78,8 @@ 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 ; \
+RUNTEST = `if [ -f ${srcdir}/../../dejagnu/runtest ] ; then \
+	       echo ${srcdir}/../../dejagnu/runtest ; \
 	    else echo runtest; fi`
 RUNTESTFLAGS =
 
@@ -173,12 +173,10 @@ testsuite/site.exp: site.exp
 # Note: we set the PATH so that we can pick up new-cygwin1.dll
 
 check: $(TESTSUP_LIB_NAME) $(RUNTIME) testsuite/site.exp
-	-rootme=`pwd`; export rootme; \
-	srcdir=`cd ${srcdir}; pwd` ; export srcdir ; \
 	cd testsuite; \
 	EXPECT=${EXPECT} ; export EXPECT ; \
-	if [ -f $${rootme}/../expect/expect ] ; then  \
+	if [ -f $(bupdir2)/expect/expect ] ; then  \
 	   TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; pwd` ; \
 	    export TCL_LIBRARY ; fi ; \
-	PATH=$${rootme}/../cygwin:$${PATH} ;\
+	PATH=$(bupdir)/cygwin:$${PATH} ;\
 	$(RUNTEST) --tool winsup $(RUNTESTFLAGS)
diff --git a/winsup/testsuite/winsup.api/winsup.exp b/winsup/testsuite/winsup.api/winsup.exp
index c47ae9a0e..6d71fa912 100644
--- a/winsup/testsuite/winsup.api/winsup.exp
+++ b/winsup/testsuite/winsup.api/winsup.exp
@@ -48,7 +48,7 @@ foreach src [glob -nocomplain $srcdir/$subdir/*.c $srcdir/$subdir/*/*.c] {
 	clear_xfail
     }
 
-    ws_spawn "$CC -g3 -mwin32 $CFLAGS $src $add_includes $add_libs $runtime_root/binmode.o $runtime_root/new-libcygwin.a -o $base.exe"
+    ws_spawn "$CC -g3 -nodefaultlibs -mwin32 $CFLAGS $src $add_includes $add_libs $runtime_root/binmode.o -lgcc $runtime_root/new-libcygwin.a -lkernel32 -luser32 -o $base.exe"
     if { $rv != "" } {
 	verbose -log "$rv"
 	fail "$testcase (compile)"