From 73912c64aa115204cb93467f441f5860dd5250cf Mon Sep 17 00:00:00 2001 From: Heikki Hannikainen Date: Wed, 11 Jul 2012 08:18:02 +0000 Subject: [PATCH] javap: o/ filter requires spaces after object name git-svn-id: http://repo.ham.fi/svn/aprsc/trunk@482 3ce903b1-3385-4e86-93cd-f9a4a239f7ac --- tests/t/33filter-pref-buddy-obj.t | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/tests/t/33filter-pref-buddy-obj.t b/tests/t/33filter-pref-buddy-obj.t index e95b9dd..1343ce0 100644 --- a/tests/t/33filter-pref-buddy-obj.t +++ b/tests/t/33filter-pref-buddy-obj.t @@ -87,18 +87,25 @@ $i_rx->sendline("#filter o/OBJ1/OBJ2/OBJ3/PRE*"); # # o/PRE*"); sleep(0.5); # the previously set prefix filter should no longer pass -$drop = "G0TES>APRS,OH2RDG*,WIDE,qAR,$login:!6028.51N/02505.68E# should drop buddy filter"; -$pass = "HSRC>APRS,qAR,$login:;OBJ1 *090902z6010.78N/02451.11E-Object 1"; -istest::should_drop(\&ok, $i_tx, $i_rx, $drop, $pass); - -# see that the filter does match -$tx = "SRC>APRS,qAR,$login:;OBJ2 *090902z6010.78N/02451.11E-Object 2"; -$rx = "SRC>APRS,qAR,$login:;OBJ2 *090902z6010.78N/02451.11E-Object 2"; -istest::txrx(\&ok, $i_tx, $i_rx, $tx, $rx); - -$tx = "SRC>APRS,qAR,$login:;OBJ3 *090902z6010.78N/02451.11E-Object 3"; -$rx = "SRC>APRS,qAR,$login:;OBJ3 *090902z6010.78N/02451.11E-Object 3"; -istest::txrx(\&ok, $i_tx, $i_rx, $tx, $rx); +if (defined $ENV{'TEST_PRODUCT'} && $ENV{'TEST_PRODUCT'} =~ /javap/) { + print "# javAPRSSrvr o/ filter requires spaces\n"; + skip "Skip: javAPRSSrvr o/ filter requires spaces"; + skip "Skip: javAPRSSrvr o/ filter requires spaces"; + skip "Skip: javAPRSSrvr o/ filter requires spaces"; +} else { + $drop = "G0TES>APRS,OH2RDG*,WIDE,qAR,$login:!6028.51N/02505.68E# should drop buddy filter"; + $pass = "HSRC>APRS,qAR,$login:;OBJ1 *090902z6010.78N/02451.11E-Object 1"; + istest::should_drop(\&ok, $i_tx, $i_rx, $drop, $pass); + + # see that the filter does match + $tx = "SRC>APRS,qAR,$login:;OBJ2 *090902z6010.78N/02451.11E-Object 2"; + $rx = "SRC>APRS,qAR,$login:;OBJ2 *090902z6010.78N/02451.11E-Object 2"; + istest::txrx(\&ok, $i_tx, $i_rx, $tx, $rx); + + $tx = "SRC>APRS,qAR,$login:;OBJ3 *090902z6010.78N/02451.11E-Object 3"; + $rx = "SRC>APRS,qAR,$login:;OBJ3 *090902z6010.78N/02451.11E-Object 3"; + istest::txrx(\&ok, $i_tx, $i_rx, $tx, $rx); +} # wildcard in end $tx = "SRC>APRS,qAR,$login:;PREFIX *090902z6010.78N/02451.11E-Object prefix";