JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.in (RUNTEST): Use Makefile's srcdir and bupdir* macros, where

Browse Source 
appropriate.
* winsup.api/winsup.exp: Use -nodefaultlibs when linking executable to avoid
potentially linking installed dll.
This commit is contained in:
Christopher Faylor 2002-08-26 02:53:24 +00:00
parent f77cd63642
commit 9d89f63486
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/testsuite/ChangeLog
View File

@ -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> 2002-07-06 Christopher Faylor <cgf@redhat.com>
* testsuite/winsup.api/winsup.exp: Add -mwin32 to gcc flags so * testsuite/winsup.api/winsup.exp: Add -mwin32 to gcc flags so

10
winsup/testsuite/Makefile.in
View File

@ -78,8 +78,8 @@ EXPECT = `if [ -f $${rootme}/../../expect/expect$(EXEEXT) ] ; then \
echo $${rootme}/../../expect/expect$(EXEEXT) ; \ echo $${rootme}/../../expect/expect$(EXEEXT) ; \
else echo expect ; fi` else echo expect ; fi`
RUNTEST = `if [ -f $${srcdir}/../../dejagnu/runtest ] ; then \ RUNTEST = `if [ -f ${srcdir}/../../dejagnu/runtest ] ; then \
echo $${srcdir}/../../dejagnu/runtest ; \ echo ${srcdir}/../../dejagnu/runtest ; \
else echo runtest; fi` else echo runtest; fi`
RUNTESTFLAGS = RUNTESTFLAGS =
@ -173,12 +173,10 @@ testsuite/site.exp: site.exp
# Note: we set the PATH so that we can pick up new-cygwin1.dll # Note: we set the PATH so that we can pick up new-cygwin1.dll
check: $(TESTSUP_LIB_NAME) $(RUNTIME) testsuite/site.exp check: $(TESTSUP_LIB_NAME) $(RUNTIME) testsuite/site.exp
-rootme=`pwd`; export rootme; \
srcdir=`cd ${srcdir}; pwd` ; export srcdir ; \
cd testsuite; \ cd testsuite; \
EXPECT=${EXPECT} ; export EXPECT ; \ EXPECT=${EXPECT} ; export EXPECT ; \
if [ -f $${rootme}/../expect/expect ] ; then \ if [ -f $(bupdir2)/expect/expect ] ; then \
TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; pwd` ; \ TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; pwd` ; \
export TCL_LIBRARY ; fi ; \ export TCL_LIBRARY ; fi ; \
PATH=$${rootme}/../cygwin:$${PATH} ;\ PATH=$(bupdir)/cygwin:$${PATH} ;\
$(RUNTEST) --tool winsup $(RUNTESTFLAGS) $(RUNTEST) --tool winsup $(RUNTESTFLAGS)

2
winsup/testsuite/winsup.api/winsup.exp
View File

@ -48,7 +48,7 @@ foreach src [glob -nocomplain $srcdir/$subdir/*.c $srcdir/$subdir/*/*.c] {
clear_xfail 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 != "" } { if { $rv != "" } {
verbose -log "$rv" verbose -log "$rv"
fail "$testcase (compile)" fail "$testcase (compile)"