Change in gr-gsm[master]: travis: gnuradio-companion 3.8 does not have --version parameter

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

ptrkrysik gerrit-no-reply at lists.osmocom.org
Mon May 3 10:31:42 UTC 2021


ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24073 )

Change subject: travis: gnuradio-companion 3.8 does not have --version parameter
......................................................................

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
---
M tests/scripts/decode.sh
M tests/scripts/decrypt.sh
2 files changed, 14 insertions(+), 4 deletions(-)

Approvals:
  ptrkrysik: Looks good to me, approved; Verified



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 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 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

-- 
To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24073
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-Change-Id: I7e00c84a4b72e9fa1dcf5ac453882f1733724ac0
Gerrit-Change-Number: 24073
Gerrit-PatchSet: 1
Gerrit-Owner: ptrkrysik <ptrkrysik at gmail.com>
Gerrit-Reviewer: ptrkrysik <ptrkrysik at gmail.com>
Gerrit-Reviewer: vvvelichkov <vvvelichkov at gmail.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210503/bb718534/attachment.htm>


More information about the gerrit-log mailing list