<p>ptrkrysik <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/gr-gsm/+/24073">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  ptrkrysik: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">travis: gnuradio-companion 3.8 does not have --version parameter<br><br>And currently grgsm, gr-osmosdr and gr-iqbal are installed in<br>/usr/local/lib/python3/dist-packages/ which is not in the default python<br>search path.<br><br>Change-Id: I7e00c84a4b72e9fa1dcf5ac453882f1733724ac0<br>---<br>M tests/scripts/decode.sh<br>M tests/scripts/decrypt.sh<br>2 files changed, 14 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/scripts/decode.sh b/tests/scripts/decode.sh</span><br><span>index c71b26e..b982709 100755</span><br><span>--- a/tests/scripts/decode.sh</span><br><span>+++ b/tests/scripts/decode.sh</span><br><span>@@ -3,7 +3,11 @@</span><br><span> TEST_DIR=`dirname "$0"`</span><br><span> </span><br><span> # PYTHONPATH and LD_LIBRARY_PATH are needed on Fedora 26</span><br><span style="color: hsl(0, 100%, 40%);">-export PYTHONPATH=/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# /usr/local/lib/python3/dist-packages/ is currently needed on Debian Testing and Kali Rolling</span><br><span style="color: hsl(120, 100%, 40%);">+# https://salsa.debian.org/bottoms/pkg-gnuradio/blob/unstable/debian/patches/debian-python-install#L8</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+export PYTHONPATH=/usr/local/lib/python3/dist-packages/:/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH</span><br><span> export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH</span><br><span> </span><br><span> export AP_DECODE="grgsm_decode"</span><br><span>@@ -14,7 +18,8 @@</span><br><span> export RUNLINE="$AP_DECODE -c $SHORTENED_CAPFILE -s $((100000000/174)) -m BCCH -t 0 -v --ppm -10"</span><br><span> echo "Testing with:"</span><br><span> echo "  $RUNLINE"</span><br><span style="color: hsl(0, 100%, 40%);">-gnuradio-companion --version</span><br><span style="color: hsl(120, 100%, 40%);">+#gnuradio 3.8 does not have --version parameter</span><br><span style="color: hsl(120, 100%, 40%);">+#gnuradio-companion --version</span><br><span> </span><br><span> cd $TEST_DIR</span><br><span> cat $CAPFILE | head -c 6000000 > $SHORTENED_CAPFILE</span><br><span>diff --git a/tests/scripts/decrypt.sh b/tests/scripts/decrypt.sh</span><br><span>index afd12cc..7f9bc60 100755</span><br><span>--- a/tests/scripts/decrypt.sh</span><br><span>+++ b/tests/scripts/decrypt.sh</span><br><span>@@ -3,7 +3,11 @@</span><br><span> TEST_DIR=`dirname "$0"`</span><br><span> </span><br><span> # PYTHONPATH and LD_LIBRARY_PATH are needed on Fedora 26</span><br><span style="color: hsl(0, 100%, 40%);">-export PYTHONPATH=/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# /usr/local/lib/python3/dist-packages/ is currently needed on Debian Testing and Kali Rolling</span><br><span style="color: hsl(120, 100%, 40%);">+# https://salsa.debian.org/bottoms/pkg-gnuradio/blob/unstable/debian/patches/debian-python-install#L8</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+export PYTHONPATH=/usr/local/lib/python3/dist-packages/:/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH</span><br><span> export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH</span><br><span> </span><br><span> export AP_DECODE="grgsm_decode"</span><br><span>@@ -14,7 +18,8 @@</span><br><span> 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"</span><br><span> echo "Testing with:"</span><br><span> echo "  $RUNLINE"</span><br><span style="color: hsl(0, 100%, 40%);">-gnuradio-companion --version</span><br><span style="color: hsl(120, 100%, 40%);">+#gnuradio 3.8 does not have --version parameter</span><br><span style="color: hsl(120, 100%, 40%);">+#gnuradio-companion --version</span><br><span> </span><br><span> cd $TEST_DIR</span><br><span> cat $CAPFILE | head -c -37000000 | head -c 35800000  > $SHORTENED_CAPFILE</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/gr-gsm/+/24073">change 24073</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/gr-gsm/+/24073"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: gr-gsm </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7e00c84a4b72e9fa1dcf5ac453882f1733724ac0 </div>
<div style="display:none"> Gerrit-Change-Number: 24073 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: ptrkrysik <ptrkrysik@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: ptrkrysik <ptrkrysik@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: vvvelichkov <vvvelichkov@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>