Cygwin: Always configure in testsuite subdirectory

Doing this properly using AC_CONFIG_SUBDIRS is necessary to get the
correct paths in flags given to the compiler specified in CC/CXX.

diff --git a/winsup/Makefile.in b/winsup/Makefile.in
index f1c1ce771a1c18d6382d043d56a0fa6d03ba45a7..ba6ed092c90ba21741ecb60cfc285cbe2786ce16 100644 (file)
--- a/winsup/Makefile.in
+++ b/winsup/Makefile.in
@@ -94,22 +94,8 @@ Makefile: Makefile.in $(srcdir)/configure config.status
 config.status: configure
        $(SHELL) config.status --recheck
 
-# The below rule is intended to run configure only when "make check" is
-# actually specified, i.e., not in a cross-compilation environment.  The
-# cygwin configuration is copied and modified to ensure that the same configuration
-# parameters are passed when the testsuite is configured as when cygwin was configured.
 check: cygwin
-       @if [ -f testsuite/config.status ]; then \
-           cd testsuite; \
-       else \
-           (mkdir testsuite 2>/dev/null || exit 0); \
-           cd testsuite; \
-           sed -e 's%winsup/cygwin\>%winsup/testsuite%g' ../cygwin/config.status > config.status; \
-           chmod a+x config.status; \
-           sh ./config.status --recheck; \
-           sh ./config.status; \
-       fi; \
-       $(MAKE) check
+       $(MAKE) -C testsuite check
 
 utils: cygwin
 

diff --git a/winsup/configure b/winsup/configure
index e028e288941536b40b3ee57be7366fef208387e1..34afe8fd4d9f12b6d87622dd09d47261caa4a96b 100755 (executable)
--- a/winsup/configure
+++ b/winsup/configure
@@ -674,7 +674,7 @@ CXX
 CXXFLAGS
 CCC
 CPP'
-ac_subdirs_all='cygwin cygserver doc
+ac_subdirs_all='cygwin cygserver doc testsuite
 utils'
 
 # Initialize some variables set by options.
@@ -3393,7 +3393,7 @@ done
 
 
 
-subdirs="$subdirs cygwin cygserver doc"
+subdirs="$subdirs cygwin cygserver doc testsuite"
 
 if test "x$with_cross_bootstrap" != "xyes"; then
     subdirs="$subdirs utils"

diff --git a/winsup/configure.ac b/winsup/configure.ac
index 65369ae7f89c7856d5e91c5df44323315c732ad8..5b420396dd292359bb5268f09eaf352e5befac85 100644 (file)
--- a/winsup/configure.ac
+++ b/winsup/configure.ac
@@ -29,7 +29,7 @@ AC_LANG(C++)
 
 AC_CYGWIN_INCLUDES
 
-AC_CONFIG_SUBDIRS(cygwin cygserver doc)
+AC_CONFIG_SUBDIRS(cygwin cygserver doc testsuite)
 if test "x$with_cross_bootstrap" != "xyes"; then
     AC_CONFIG_SUBDIRS([utils])
 fi