From 6500cce6aaaf691f6bb9c5e1b805b112b687ceb8 Mon Sep 17 00:00:00 2001 From: emankov Date: Mon, 15 Jan 2018 14:20:37 +0300 Subject: [PATCH] [HIPIFY][#311][fix] Get rid of socat in run_test.sh --- hipify-clang/CMakeLists.txt | 3 --- tests/hipify-clang/run_test.sh | 11 ----------- 2 files changed, 14 deletions(-) diff --git a/hipify-clang/CMakeLists.txt b/hipify-clang/CMakeLists.txt index 5910698e51..8b3fa7e591 100644 --- a/hipify-clang/CMakeLists.txt +++ b/hipify-clang/CMakeLists.txt @@ -78,9 +78,6 @@ if (HIPIFY_CLANG_TESTS) require_program(lit) require_program(FileCheck) - if(NOT WIN32) - require_program(socat) - endif() # Populates CUDA_TOOLKIT_ROOT_DIR, which is then applied to the lit config to give the # value of --cuda-path for the test runs. diff --git a/tests/hipify-clang/run_test.sh b/tests/hipify-clang/run_test.sh index 46b2fc066b..418df5dd4d 100755 --- a/tests/hipify-clang/run_test.sh +++ b/tests/hipify-clang/run_test.sh @@ -13,16 +13,5 @@ shift 3 # Remaining args are the ones to forward to clang proper. -# Time for the classic insane little trick for making colour output work. -# A self-deleting shell-script that does the thing we want to do... -TMP_SCRIPT=$(mktemp) -cat << EOF > $TMP_SCRIPT -set -o errexit -set -o xtrace -rm $TMP_SCRIPT $HIPIFY -o=$TMP_FILE $IN_FILE -- $@ && cat $TMP_FILE | sed -Ee 's|//.+|// |g' | FileCheck $IN_FILE -EOF -chmod a+x $TMP_SCRIPT -# Run the script via socat, spawning a virtual terminal and propagating exit code, and hence failure. -socat -du EXEC:$TMP_SCRIPT,pty,stderr STDOUT