diff options
| author | Vasil Velichkov <vvvelichkov@gmail.com> | 2019-09-02 19:32:19 +0300 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@gmail.com> | 2020-02-14 15:14:07 +0000 |
| commit | 5b8c376561060cc65db8bb7b51eb7eccfba62157 (patch) | |
| tree | f28438e055f7988cf0653983999bddffe7e16a7a | |
| parent | d9503aa83dc1c71df9ce93fc45c3c96609430717 (diff) | |
travis: gnuradio-companion 3.8 does not have --version parameter
And currently grgsm, gr-osmosdr and gr-iqbal are installed in
/usr/local/lib/python3/dist-packages/ which is not in the default python
search path.
Change-Id: I7e00c84a4b72e9fa1dcf5ac453882f1733724ac0
| -rwxr-xr-x | tests/scripts/decode.sh | 9 | ||||
| -rwxr-xr-x | tests/scripts/decrypt.sh | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/tests/scripts/decode.sh b/tests/scripts/decode.sh index c71b26e..b982709 100755 --- a/tests/scripts/decode.sh +++ b/tests/scripts/decode.sh @@ -3,7 +3,11 @@ TEST_DIR=`dirname "$0"` # PYTHONPATH and LD_LIBRARY_PATH are needed on Fedora 26 -export PYTHONPATH=/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH +# +# /usr/local/lib/python3/dist-packages/ is currently needed on Debian Testing and Kali Rolling +# https://salsa.debian.org/bottoms/pkg-gnuradio/blob/unstable/debian/patches/debian-python-install#L8 +# +export PYTHONPATH=/usr/local/lib/python3/dist-packages/:/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH export AP_DECODE="grgsm_decode" @@ -14,7 +18,8 @@ export RESULT_OBTAINED="grgsm_decode_test1_result" export RUNLINE="$AP_DECODE -c $SHORTENED_CAPFILE -s $((100000000/174)) -m BCCH -t 0 -v --ppm -10" echo "Testing with:" echo " $RUNLINE" -gnuradio-companion --version +#gnuradio 3.8 does not have --version parameter +#gnuradio-companion --version cd $TEST_DIR cat $CAPFILE | head -c 6000000 > $SHORTENED_CAPFILE diff --git a/tests/scripts/decrypt.sh b/tests/scripts/decrypt.sh index afd12cc..7f9bc60 100755 --- a/tests/scripts/decrypt.sh +++ b/tests/scripts/decrypt.sh @@ -3,7 +3,11 @@ TEST_DIR=`dirname "$0"` # PYTHONPATH and LD_LIBRARY_PATH are needed on Fedora 26 -export PYTHONPATH=/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH +# +# /usr/local/lib/python3/dist-packages/ is currently needed on Debian Testing and Kali Rolling +# https://salsa.debian.org/bottoms/pkg-gnuradio/blob/unstable/debian/patches/debian-python-install#L8 +# +export PYTHONPATH=/usr/local/lib/python3/dist-packages/:/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH export AP_DECODE="grgsm_decode" @@ -14,7 +18,8 @@ export RESULT_OBTAINED="grgsm_decode_test1_result" export RUNLINE="$AP_DECODE -c $SHORTENED_CAPFILE -s $((100000000/174)) -m SDCCH8 -t 1 -k 0x1E,0xF0,0x0B,0xAB,0x3B,0xAC,0x70,0x02 -v --ppm -10" echo "Testing with:" echo " $RUNLINE" -gnuradio-companion --version +#gnuradio 3.8 does not have --version parameter +#gnuradio-companion --version cd $TEST_DIR cat $CAPFILE | head -c -37000000 | head -c 35800000 > $SHORTENED_CAPFILE |