[gpsd-dev] [PATCH 2/2] Fixes rtcm-regress and aivdm-regress for OpenBSD.

[Fred Wright]

Traditionally, mktemp required that the Xs in the template be at the
end.  Although most modern versions of mktemp have relaxed this
restriction (in spite of what their manpages may say), the OpenBSD
mktemp still has this restriction, and fails with the templates
provided in these tests.  Rearranging the templates fixes this, at the
expense of no longer having a pure ".chk" extension on the temp files.

TESTED:
Verified that these previously failing tests now pass on OpenBSD 5.6
(as well as OSX).
---
 SConstruct | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/SConstruct b/SConstruct
index a3c21b0..202401a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1568,13 +1568,13 @@ else:
         '@echo "Testing RTCM decoding..."',
         '@for f in $SRCDIR/test/*.rtcm2; do '
             'echo "\tTesting $${f}..."; '
-            'TMPFILE=`mktemp -t gpsd-test-XXXXXXXXXXXXXX.chk`; '
+            'TMPFILE=`mktemp -t gpsd-test.chk-XXXXXXXXXXXXXX`; '
             '$SRCDIR/gpsdecode -u -j <$${f} >$${TMPFILE}; '
             'diff -ub $${f}.chk $${TMPFILE} || echo "Test FAILED!"; '
             'rm -f $${TMPFILE}; '
         'done;',
         '@echo "Testing idempotency of JSON dump/decode for RTCM2"',
-        '@TMPFILE=`mktemp -t gpsd-test-XXXXXXXXXXXXXX.chk`; '
+        '@TMPFILE=`mktemp -t gpsd-test.chk-XXXXXXXXXXXXXX`; '
         '$SRCDIR/gpsdecode -u -e -j <test/synthetic-rtcm2.json >$${TMPFILE}; '
             'grep -v "^#" test/synthetic-rtcm2.json | diff -ub - $${TMPFILE} '
             '|| echo "Test FAILED!"; '
@@ -1597,7 +1597,7 @@ else:
         '@echo "Testing AIVDM decoding w/ CSV format..."',
         '@for f in $SRCDIR/test/*.aivdm; do '
             'echo "\tTesting $${f}..."; '
-            'TMPFILE=`mktemp -t gpsd-test-XXXXXXXXXXXXXX.chk`; '
+            'TMPFILE=`mktemp -t gpsd-test.chk-XXXXXXXXXXXXXX`; '
             '$SRCDIR/gpsdecode -u -c <$${f} >$${TMPFILE}; '
             'diff -ub $${f}.chk $${TMPFILE} || echo "Test FAILED!"; '
             'rm -f $${TMPFILE}; '
@@ -1605,7 +1605,7 @@ else:
         '@echo "Testing AIVDM decoding w/ JSON unscaled format..."',
         '@for f in $SRCDIR/test/*.aivdm; do '
             'echo "\tTesting $${f}..."; '
-            'TMPFILE=`mktemp -t gpsd-test-XXXXXXXXXXXXXX.chk`; '
+            'TMPFILE=`mktemp -t gpsd-test.chk-XXXXXXXXXXXXXX`; '
             '$SRCDIR/gpsdecode -u -j <$${f} >$${TMPFILE}; '
             'diff -ub $${f}.ju.chk $${TMPFILE} || echo "Test FAILED!"; '
             'rm -f $${TMPFILE}; '
@@ -1613,20 +1613,20 @@ else:
         '@echo "Testing AIVDM decoding w/ JSON scaled format..."',
         '@for f in $SRCDIR/test/*.aivdm; do '
             'echo "\tTesting $${f}..."; '
-            'TMPFILE=`mktemp -t gpsd-test-XXXXXXXXXXXXXX.chk`; '
+            'TMPFILE=`mktemp -t gpsd-test.chk-XXXXXXXXXXXXXX`; '
             '$SRCDIR/gpsdecode -j <$${f} >$${TMPFILE}; '
             'diff -ub $${f}.js.chk $${TMPFILE} || echo "Test FAILED!"; '
             'rm -f $${TMPFILE}; '
         'done;',
         '@echo "Testing idempotency of unscaled JSON dump/decode for AIS"',
-        '@TMPFILE=`mktemp -t gpsd-test-XXXXXXXXXXXXXX.chk`; '
+        '@TMPFILE=`mktemp -t gpsd-test.chk-XXXXXXXXXXXXXX`; '
         '$SRCDIR/gpsdecode -u -e -j <$SRCDIR/test/sample.aivdm.ju.chk 
>$${TMPFILE}; '
             'grep -v "^#" $SRCDIR/test/sample.aivdm.ju.chk | diff -ub - 
$${TMPFILE} || echo "Test FAILED!"; '
             'rm -f $${TMPFILE}; ',
         # Parse the unscaled json reference, dump it as scaled json,
         # and finally compare it with the scaled json reference
         '@echo "Testing idempotency of scaled JSON dump/decode for AIS"',
-        '@TMPFILE=`mktemp -t gpsd-test-XXXXXXXXXXXXXX.chk`; '
+        '@TMPFILE=`mktemp -t gpsd-test.chk-XXXXXXXXXXXXXX`; '
         '$SRCDIR/gpsdecode -e -j <$SRCDIR/test/sample.aivdm.ju.chk 
>$${TMPFILE}; '
             'grep -v "^#" $SRCDIR/test/sample.aivdm.js.chk | diff -ub - 
$${TMPFILE} || echo "Test FAILED!"; '
             'rm -f $${TMPFILE}; ',
-- 
2.7.1