Merge pull request #589 from stilor/skip-complibs-check-on-host-canadian

Skip complibs check on host for canadian
This commit is contained in:
Alexey Neyman 2017-02-12 11:19:31 -08:00 committed by GitHub
commit c31ed45a65
7 changed files with 75 additions and 12 deletions

View File

@ -0,0 +1,33 @@
'make check' should return with non-zero status
... if the test fails.
--- zlib-1.2.11/Makefile.in.orig 2017-02-11 12:00:37.768094420 -0800
+++ zlib-1.2.11/Makefile.in 2017-02-11 12:01:02.088399001 -0800
@@ -91,7 +91,7 @@
echo ' *** zlib test OK ***'; \
else \
echo ' *** zlib test FAILED ***'; false; \
- fi; \
+ fi
rm -f $$TMPST
testshared: shared
@@ -104,7 +104,7 @@
echo ' *** zlib shared test OK ***'; \
else \
echo ' *** zlib shared test FAILED ***'; false; \
- fi; \
+ fi
rm -f $$TMPSH
test64: all64
@@ -113,7 +113,7 @@
echo ' *** zlib 64-bit test OK ***'; \
else \
echo ' *** zlib 64-bit test FAILED ***'; false; \
- fi; \
+ fi
rm -f $$TMP64
infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h

View File

@ -97,8 +97,13 @@ do_zlib_backend() {
CT_DoExecLog ALL make ${JOBSFLAGS}
if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking zlib"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
if [ "${host}" = "${CT_BUILD}" ]; then
CT_DoLog EXTRA "Checking zlib"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
else
# Cannot run host binaries on build in a canadian cross
CT_DoLog EXTRA "Skipping check for zlib on the host"
fi
fi
CT_DoLog EXTRA "Installing zlib"

View File

@ -106,8 +106,13 @@ do_gmp_backend() {
CT_DoExecLog ALL make ${JOBSFLAGS}
if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking GMP"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
if [ "${host}" = "${CT_BUILD}" ]; then
CT_DoLog EXTRA "Checking GMP"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
else
# Cannot run host binaries on build in a canadian cross
CT_DoLog EXTRA "Skipping check for GMP on the host"
fi
fi
CT_DoLog EXTRA "Installing GMP"

View File

@ -149,8 +149,13 @@ do_mpfr_backend() {
CT_DoExecLog ALL make ${JOBSFLAGS}
if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking MPFR"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
if [ "${host}" = "${CT_BUILD}" ]; then
CT_DoLog EXTRA "Checking MPFR"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
else
# Cannot run host binaries on build in a canadian cross
CT_DoLog EXTRA "Skipping check for MPFR on the host"
fi
fi
CT_DoLog EXTRA "Installing MPFR"

View File

@ -115,8 +115,13 @@ do_isl_backend() {
CT_DoExecLog ALL make ${JOBSFLAGS}
if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking ISL"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
if [ "${host}" = "${CT_BUILD}" ]; then
CT_DoLog EXTRA "Checking ISL"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
else
# Cannot run host binaries on build in a canadian cross
CT_DoLog EXTRA "Skipping check for ISL on the host"
fi
fi
CT_DoLog EXTRA "Installing ISL"

View File

@ -112,8 +112,13 @@ do_cloog_backend() {
CT_DoExecLog ALL make ${JOBSFLAGS}
if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking CLooG"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
if [ "${host}" = "${CT_BUILD}" ]; then
CT_DoLog EXTRA "Checking CLooG"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
else
# Cannot run host binaries on build in a canadian cross
CT_DoLog EXTRA "Skipping check for CLooG on the host"
fi
fi
CT_DoLog EXTRA "Installing CLooG"

View File

@ -100,8 +100,13 @@ do_mpc_backend() {
CT_DoExecLog ALL make ${JOBSFLAGS}
if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking MPC"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
if [ "${host}" = "${CT_BUILD}" ]; then
CT_DoLog EXTRA "Checking MPC"
CT_DoExecLog ALL make ${JOBSFLAGS} -s check
else
# Cannot run host binaries on build in a canadian cross
CT_DoLog EXTRA "Skipping check for MPC on the host"
fi
fi
CT_DoLog EXTRA "Installing MPC"