[ptxdist] [PATCH support/ptxdist-2017.05.x_GP v3] ptxd_make_world_compile.sh: conditionally redirect stderr>stdout

[jon@ringle.org]

From: Jon Ringle <jringle@gridpoint.com>

I discovered after updating to a new version of ptxdist that all of my
compile output including errors/warnings are now all going to stdout
instead of having the errors/warning going to stderr.

This is causing some problem when I use qtcreator as my IDE because
qtcreator will only filter stderr for errors/warnings to put into the
Issues tab, where one can simply click on the error/warning and be taken
right to the source line where the error/warning is found.

I found that this problem was introduced by commit
30b9267e35eea1c2edb4da0231a428bfa25b6766

This patch will conditionally redirect stderr>stdout on compile output
if ptxdist has output synchronization enabled.

This small program demonstrates the behavior with this patch applied:

$ cat local_src/testprog/testprog.c
#include <stdio.h>
#include <stdlib.h>

#error An error here
int main(int argc, char *argv[])
{
        printf("Hello World, I'm testprog!\n");

        exit(EXIT_SUCCESS);
}

$ ptxdist compile testprog >/dev/null
testprog.c:4:2: error: #error An error here
 #error An error here
  ^
make[1]: *** [testprog] Error 1
make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2

$ ptxdist compile --output-sync testprog >/dev/null
make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2

$ ptxdist compile --no-output-sync testprog >/dev/null
testprog.c:4:2: error: #error An error here
 #error An error here
  ^
make[1]: *** [testprog] Error 1
make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2

Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
 bin/ptxdist                            | 4 ++++
 scripts/lib/ptxd_make_world_common.sh  | 2 ++
 scripts/lib/ptxd_make_world_compile.sh | 6 +++---
 scripts/libptxdist.sh                  | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/ptxdist b/bin/ptxdist
index 1e3c53a..65a847b 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -2383,6 +2383,7 @@ setup_config() {
 #      PTXDIST_PARALLELMFLAGS_INTERN
 #      PTXDIST_PARALLELMFLAGS_EXTERN
 #      PTXDIST_OUTPUT_SYNC
+#      PTXDIST_FD_LOGERR
 #
 setup_parallel() {
 	# default no parallel for now
@@ -2415,10 +2416,12 @@ setup_parallel() {
 	fi
 
 	PTXDIST_OUTPUT_SYNC="${PTXDIST_OUTPUT_SYNC:-${PTXDIST_QUIET}}"
+	PTXDIST_FD_LOGERR=2
 	if [ "${PTXDIST_OUTPUT_SYNC}" == "1" ]; then
 		if "${PTXCONF_SETUP_HOST_MAKE}" -h | grep -q -- --output-sync; then
 			PTXDIST_OUTPUT_SYNC="--output-sync="
 		fi
+		PTXDIST_FD_LOGERR=1
 	fi
 	if [[ "${PTXDIST_OUTPUT_SYNC}" =~ [01] ]]; then
 		unset PTXDIST_OUTPUT_SYNC
@@ -2714,6 +2717,7 @@ setup_export() {
 		PTXDIST_LOADMFLAGS \
 		\
 		PTXDIST_CCACHE \
+		PTXDIST_FD_LOGERR \
 		PTXDIST_FORCE_DOWNLOAD \
 		PTXDIST_ICECC \
 		PTXDIST_LOG_PROMPT \
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh
index befd1df..b366dc8 100644
--- a/scripts/lib/ptxd_make_world_common.sh
+++ b/scripts/lib/ptxd_make_world_common.sh
@@ -381,5 +381,7 @@ ptxd_make_world_init() {
 	"NO")	  pkg_make_par=-j1 ;;
 	*)	  ptxd_bailout "<PKG>_MAKE_PAR: please set to YES or NO" ;;
     esac
+
+    exec 2>&${PTXDIST_FD_LOGERR}
 }
 export -f ptxd_make_world_init
diff --git a/scripts/lib/ptxd_make_world_compile.sh b/scripts/lib/ptxd_make_world_compile.sh
index 9cc739e..6d4a611 100644
--- a/scripts/lib/ptxd_make_world_compile.sh
+++ b/scripts/lib/ptxd_make_world_compile.sh
@@ -28,7 +28,7 @@ ptxd_make_world_compile() {
 	    "${ptx_build_python}" \
 	    setup.py \
 	    "${pkg_make_opt}"
-	) 2>&1
+	)
 	;;
 	meson)
 	ptxd_eval \
@@ -37,7 +37,7 @@ ptxd_make_world_compile() {
 	    "${pkg_make_env}" \
 	    ninja -C "${pkg_build_dir}" \
 	    "${pkg_make_opt}" \
-	    "${pkg_make_par}" 2>&1
+	    "${pkg_make_par}"
 	;;
 	*)
 	ptxd_eval \
@@ -46,7 +46,7 @@ ptxd_make_world_compile() {
 	    "${pkg_make_env}" \
 	    "${MAKE}" -C "${pkg_build_dir}" \
 	    "${pkg_make_opt}" \
-	    "${pkg_make_par}" 2>&1
+	    "${pkg_make_par}"
 	;;
     esac
 }
diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh
index 6f66be6..b877746 100644
--- a/scripts/libptxdist.sh
+++ b/scripts/libptxdist.sh
@@ -733,7 +733,7 @@ ptxd_debug "Debugging is enabled - Turn off with PTX_DEBUG=false"
 # ${PTXDIST_LOG_PROMPT}: to be printed before message
 #
 ptxd_bailout() {
-	echo "${PTXDIST_LOG_PROMPT}error: $1" >&2
+	echo "${PTXDIST_LOG_PROMPT}error: $1" >&${PTXDIST_FD_LOGERR}
 	exit ${2:-1}
 }
 export -f ptxd_bailout
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de