summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-05-24 12:14:05 +0000
committerbors <bors@rust-lang.org>2019-05-24 12:14:05 +0000
commit9ff0a740bd7c4146431c6b6d9bf00803051dbdc2 (patch)
tree193b023e6db9a1833ea0e9185fcf4f404fa078b5
parentf775bea997307fe701e05952c1c97877b40c9f9f (diff)
parent70c9a98c1c19805470776526a52a5a8867e8c834 (diff)
downloadrust-libc-9ff0a740bd7c4146431c6b6d9bf00803051dbdc2.tar.gz
Auto merge of #1362 - gnzlbg:cmsg, r=gnzlbg
Run CMSG tests on s390x Closes #1240.
-rwxr-xr-xci/test-runner-linux9
1 files changed, 0 insertions, 9 deletions
diff --git a/ci/test-runner-linux b/ci/test-runner-linux
index 569fa00770..cad31ec4c0 100755
--- a/ci/test-runner-linux
+++ b/ci/test-runner-linux
@@ -5,15 +5,6 @@ set -e
arch=$1
prog=$2
-# Skip cmsg test on linux-s390x
-# https://github.com/rust-lang/libc/issues/1240
-if [ "$arch" = "s390x" ]; then
- progbasename=`basename $prog`
- if [ "${progbasename%%-*}" = "cmsg" ]; then
- exit 0
- fi
-fi
-
cd /qemu/init
echo "#!/bin/sh\n/prog --color=never" > run_prog.sh
chmod +x run_prog.sh