[X2Go-Commits] [nx-libs] 11/14: Regression fix for a93f64e4. The test executables bails out on test failure, whereas ifdef does not. Adding "|| true" where needed.

git-admin at x2go.org git-admin at x2go.org
Thu Nov 22 09:33:00 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit e4a7baf15897377788a9df93d59521fa307af519
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 14 15:18:22 2018 +0100

    Regression fix for a93f64e4. The test executables bails out on test failure, whereas ifdef does not. Adding "|| true" where needed.
---
 Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 9800f83..ada8751 100644
--- a/Makefile
+++ b/Makefile
@@ -62,18 +62,18 @@ NX_XTRANS_HEADERS =		\
 all: build
 
 clean:
-	test -f nxcomp/Makefile     && ${MAKE} -C nxcomp clean
-	test -f nxproxy/Makefile    && ${MAKE} -C nxproxy clean
-	test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib clean
-	test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad clean
-	test -d nx-X11              && ${MAKE} clean-env
+	test -f nxcomp/Makefile     && ${MAKE} -C nxcomp clean         || true
+	test -f nxproxy/Makefile    && ${MAKE} -C nxproxy clean        || true
+	test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib clean     || true
+	test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad clean     || true
+	test -d nx-X11              && ${MAKE} clean-env               || true
 
 distclean: clean
-	test -f nxcomp/Makefile     && ${MAKE} -C nxcomp distclean
-	test -f nxproxy/Makefile    && ${MAKE} -C nxproxy distclean
-	test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib distclean
-	test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad distclean
-	test -d nx-X11              && ${MAKE} -C nx-X11 distclean
+	test -f nxcomp/Makefile     && ${MAKE} -C nxcomp distclean     || true
+	test -f nxproxy/Makefile    && ${MAKE} -C nxproxy distclean    || true
+	test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib distclean || true
+	test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad distclean || true
+	test -d nx-X11              && ${MAKE} -C nx-X11 distclean     || true
 	test -x ./mesa-quilt        && ./mesa-quilt pop -a
 	$(RM_DIR_REC) nx-X11/extras/Mesa/.pc/
 	$(RM_FILE) nx-X11/config/cf/nxversion.def

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list