From 2ca39b80600b856f2ae10d253e2088f1714508d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Jul 2014 12:40:15 +0200
Subject: no-rpath-prebuild.sh: Don't run resulting binary

This leads to numerous build failures:

  http://hydra.nixos.org/eval/1136585

because ELF interpreter names are not unique (e.g. ld-linux.so.2 is
used on systems other than i686-linux).
---
 tests/no-rpath-prebuild.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/no-rpath-prebuild.sh b/tests/no-rpath-prebuild.sh
index 0fc96d2..d059dda 100755
--- a/tests/no-rpath-prebuild.sh
+++ b/tests/no-rpath-prebuild.sh
@@ -1,11 +1,13 @@
 #! /bin/sh -e
+set -x
 ARCH="$1"
-SCRATCH=scratch/no-rpath-$ARCH
 
 if [ -z "$ARCH" ]; then
   ARCH=$(basename $0 .sh | sed -e 's/.*-//')
 fi
 
+SCRATCH=scratch/no-rpath-$ARCH
+
 if [ -z "$ARCH" ] || [ $ARCH = prebuild ] ; then
   echo "Architecture required"
   exit 1
@@ -34,8 +36,3 @@ if ! echo "$newRPath" | grep -q '/foo:/bar'; then
     echo "incomplete RPATH"
     exit 1
 fi
-
-if [ "$(../src/patchelf --print-interpreter $no_rpath_bin)" \
-     = "$(../src/patchelf --print-interpreter ../src/patchelf)" ]; then
-    cd ${SCRATCH} && ./no-rpath
-fi
-- 
cgit v0.12