]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
CI: Fixing path issue on venv check
authorMike Bradeen <mbradeen@sangoma.com>
Wed, 31 Aug 2022 19:16:12 +0000 (13:16 -0600)
committerMichael Bradeen <mbradeen@sangoma.com>
Wed, 31 Aug 2022 20:55:48 +0000 (15:55 -0500)
ASTERISK-26826

Change-Id: I07388d16f74452cebc9c981f99044eb6b77df792

tests/CI/runTestsuite.sh

index 230834956b81b9541c1007b193540da8bfb00bc1..ec4292c72c5d48b2108c06d1dab194b47a109b21 100755 (executable)
@@ -4,7 +4,6 @@ REALTIME=0
 TEST_TIMEOUT=600
 source $CIDIR/ci.functions
 ASTETCDIR=$DESTDIR/etc/asterisk
-SETUPVENV=$TESTSUITE_DIR/setupVenv.sh
 
 if [ x"$WORK_DIR" != x ] ; then
        export AST_WORK_DIR="$(readlink -f $WORK_DIR)"
@@ -19,11 +18,13 @@ if [ $REALTIME -eq 1 ] ; then
 fi
 
 # check to see if venv scripts exist so we can use them
-if [ -f "$SETUPVENV" ] ; then
+if [ -f ./setupVenv.sh ] ; then
+       echo "Running in Virtual Environment"
        # explicitly invoking setupVenv to capture output in case of failure
        ./setupVenv.sh
        VENVPREFIX="runInVenv.sh python "
 else
+       echo "Running in Legacy Mode"
        export PYTHONPATH=./lib/python/
 fi