Przeglądaj źródła

Enhancement in tests runner

Now we set a PYTHONPATH variable instead of hacking inside python code
Yann Weber 7 lat temu
rodzic
commit
5aa1ac55cf
2 zmienionych plików z 5 dodań i 2 usunięć
  1. 2
    1
      runtest.sh
  2. 3
    1
      runtest_context.sh

+ 2
- 1
runtest.sh Wyświetl plik

@@ -62,7 +62,8 @@ else
62 62
     mkdir $logdir
63 63
 fi
64 64
 
65
-PYTHON='env python3'
65
+export PYTHONPATH="$PYTHONPATH:$(pwd)"
66
+PYTHON="env python3"
66 67
 ret_status=0
67 68
 
68 69
 $PYTHON ./nocontext_tests.py $logdir $@ || ret_status=1

+ 3
- 1
runtest_context.sh Wyświetl plik

@@ -45,6 +45,8 @@
45 45
 #
46 46
 # https://docs.python.org/3.4/library/unittest.html
47 47
 #
48
+export PYTHONPATH="$(pwd)/$(dirname $0)/:$PYTHONPATH"
49
+
48 50
 if test ! -f lodel/buildconf.py
49 51
 then
50 52
 	echo "You have to build the project before running the tests"
@@ -52,7 +54,7 @@ then
52 54
 	exit 1
53 55
 fi
54 56
 
55
-PYTHON='env python3'
57
+PYTHON="env python3"
56 58
 testdir=$(mktemp -td "lodel2_unittest_instance_XXXXXXXX")
57 59
 install_model_dir="[@]INSTALLMODEL_DIR[@]"
58 60
 if [ ! -d "$install_model_dir" ]

Loading…
Anuluj
Zapisz