aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marvin Schmidt <marv@exherbo.org> 2016-05-02 13:39:56 +0200
committerAvatar Bo ├śrsted Andresen <zlin@exherbo.org> 2016-05-03 13:35:01 +0200
commitb3f7c9b0922c8094535ee84416660b64c677d478 (patch)
tree79cedce1f95c85a433cad155c042ea28502c36a9
parent30332e5ac62a5d0a613524955b3bb5d0a3ec7cc3 (diff)
downloadpaludis-b3f7c9b0922c8094535ee84416660b64c677d478.tar.gz
paludis-b3f7c9b0922c8094535ee84416660b64c677d478.tar.xz
run_test.sh: Strip path from test program
TEST_SCRIPT_DIR already contains the path, so it should be removed from the test program (seems like automake only includes the paths for test programs with an extension, so TEST_SCRIPT_DIR is still needed for test programs without extension). Otherwise out-of-tree builds fail their python tests because the cleanup/setup scripts aren't found due to the duplicated path: >>> No ../../../python/../../../python/choices_TEST_setup.sh to run It turns out that distcheck only worked with automake versions prior to 1.15 because of the folder structure it used. With the duplicated path it ended up finding the scripts in paludis/python instead of the distributed ones in paludis/paludis-x.y.z/python. automake 1.15 changed the build folder for distcheck from $(distdir)/_build to $(distdir)/_build/sub which caused the distcheck to fail and expose this problem. Change-Id: Ie0627bf507d791db7497eeca383160fa50ccbe18 Reviewed-on: https://galileo.mailstation.de/gerrit/5948 Reviewed-by: Bo ├śrsted Andresen <zlin@exherbo.org>
-rw-r--r--paludis/util/run_test.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/paludis/util/run_test.sh b/paludis/util/run_test.sh
index 4a428add2..07c78797c 100644
--- a/paludis/util/run_test.sh
+++ b/paludis/util/run_test.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# vim: set ft=sh sw=4 sts=4 et :
-testname=${2:-${1}}
+testname=$(basename ${2:-${1}})
interp=
[[ ${testname%.py} != ${testname} ]] && interp="${PYTHON}"
[[ ${testname%.rb} != ${testname} ]] && interp="${RUBY} -I ./.libs/"