From 94f2cdf4a8ccb7d38e017beaaca4af7c49da87aa Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=98yvind=20A=2E=20Holm?= <sunny@sunbase.org>
Date: Thu, 2 Oct 2008 21:30:57 +0200
Subject: [PATCH] =?utf8?q?*=20/trunk/src/gpstools/tests/addpoints/addpoint?=
 =?utf8?q?s.t=20*=20/trunk/src/gpstools/tests/gpst-pic/gpst-pic.t=20*=20/t?=
 =?utf8?q?runk/src/gpstools/tests/run-tests.pl=20=20=20Merga=20r2743=20inn?=
 =?utf8?q?=20med=20mergesvn,=20den=20testen=20som=20feila=20p=C3=A5=20Debi?=
 =?utf8?q?an=203.1=20og=20=20=20eldre.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* /trunk/src/gpstools/tests/gpst-pic/log/todo-tests.log
* /trunk/src/gpstools/tests/log/tests.log
* /trunk/src/gpstools/tests/log/todo-tests.log
  Linjenummer har forandra seg.

a101a54e-90b8-11dd-932f-000475e441b9

git-svn-id: svn+ssh://svnhost/utils@2750 ddca7c6a-6bd8-0310-abd8-a0f6a7c394c1
---
 tests/addpoints/addpoints.t       |  7 +------
 tests/gpst-pic/gpst-pic.t         |  7 +------
 tests/gpst-pic/log/todo-tests.log |  4 ++--
 tests/log/tests.log               |  6 +++---
 tests/log/todo-tests.log          | 10 +++++-----
 tests/run-tests.pl                |  7 +------
 6 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/tests/addpoints/addpoints.t b/tests/addpoints/addpoints.t
index 4fbe9c0..10df184 100755
--- a/tests/addpoints/addpoints.t
+++ b/tests/addpoints/addpoints.t
@@ -97,12 +97,7 @@ likecmd("$CMD -h", # {{{
 );
 
 # }}}
-unlike(`$CMD -h`, # {{{
-    '/\$Id: /',
-    "\"$CMD -h\" - No Id with only -h",
-);
-
-# }}}
+ok(`$CMD -h` !~ /\$Id: /s, "\"$CMD -h\" - No Id with only -h");
 diag("Testing -v (--verbose) option...");
 likecmd("$CMD -hv", # {{{
     '/\$Id: .*? \$.*  Show this help\./s',
diff --git a/tests/gpst-pic/gpst-pic.t b/tests/gpst-pic/gpst-pic.t
index 6bb7c88..11b0c5b 100755
--- a/tests/gpst-pic/gpst-pic.t
+++ b/tests/gpst-pic/gpst-pic.t
@@ -127,12 +127,7 @@ likecmd("$CMD -h", # {{{
 );
 
 # }}}
-unlike(`$CMD -h`, # {{{
-    '/\$Id: /',
-    "\"$CMD -h\" - No Id with only -h",
-);
-
-# }}}
+ok(`$CMD -h` !~ /\$Id: /s, "\"$CMD -h\" - No Id with only -h");
 diag("Testing --output-format option..."); # {{{
 # pgtab
 testcmd("$CMD -o pgtab files/DSC_4426.JPG", # {{{
diff --git a/tests/gpst-pic/log/todo-tests.log b/tests/gpst-pic/log/todo-tests.log
index cd32d09..eddfb21 100644
--- a/tests/gpst-pic/log/todo-tests.log
+++ b/tests/gpst-pic/log/todo-tests.log
@@ -4,7 +4,7 @@ ok - use GPSTxml;
 # Running TODO tests...
 not ok - "../../gpst-pic -o extxml files/DSC_4426.JPG" - Show extended XML information for DSC_4426.JPG
 #   Failed test '"../../gpst-pic -o extxml files/DSC_4426.JPG" - Show extended XML information for DSC_4426.JPG'
-#   in ./gpst-pic.t at line 314.
+#   in ./gpst-pic.t at line 309.
 #          got: ''
 #     expected: '<?xml version="1.0" encoding="UTF-8"?>
 # <gpstpic>
@@ -31,7 +31,7 @@ not ok - "../../gpst-pic -o extxml files/DSC_4426.JPG" - Show extended XML infor
 # '
 not ok - "../../gpst-pic -o extxml files/DSC_4426.JPG" - Show extended XML information for DSC_4426.JPG (stderr)
 #   Failed test '"../../gpst-pic -o extxml files/DSC_4426.JPG" - Show extended XML information for DSC_4426.JPG (stderr)'
-#   in ./gpst-pic.t at line 317.
+#   in ./gpst-pic.t at line 312.
 #          got: 'gpst-pic: extxml: Unknown output format
 # '
 #     expected: ''
diff --git a/tests/log/tests.log b/tests/log/tests.log
index 3032958..2dd0a93 100644
--- a/tests/log/tests.log
+++ b/tests/log/tests.log
@@ -117,7 +117,7 @@ ok - "../gpst -e pause.gpx" - --epoch is ignored in gpsml output
 ok - "../gpst -e pause.gpx" - --epoch is ignored in gpsml output (stderr)
 not ok - "../gpst -e -o gpx pause.gpx" - --epoch is ignored in gpx output
 #   Failed test '"../gpst -e -o gpx pause.gpx" - --epoch is ignored in gpx output'
-#   in ./run-tests.pl at line 1865.
+#   in ./run-tests.pl at line 1860.
 #          got: '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 # <gpx
 #   version="1.1"
@@ -208,7 +208,7 @@ ok - "../gpst -o gpx comments.mayko" - Output GPX from Mayko file with commented
 ok - "../gpst -o gpx comments.mayko" - Output GPX from Mayko file with commented-out lines (stderr)
 not ok - "../gpst -o gpx missing.gpsml" - Output GPX from gpsml with missing data
 #   Failed test '"../gpst -o gpx missing.gpsml" - Output GPX from gpsml with missing data'
-#   in ./run-tests.pl at line 1865.
+#   in ./run-tests.pl at line 1860.
 #          got: '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 # <gpx
 #   version="1.1"
@@ -313,7 +313,7 @@ ok - "../gpst --version" - Option --version returns Id string (stderr)
 # Testing --strip-whitespace option...
 not ok - "../gpst -w -o gpx pause.gpx" - Strip whitespace from GPX output
 #   Failed test '"../gpst -w -o gpx pause.gpx" - Strip whitespace from GPX output'
-#   in ./run-tests.pl at line 1865.
+#   in ./run-tests.pl at line 1860.
 #          got: '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 # <gpx
 # version="1.1"
diff --git a/tests/log/todo-tests.log b/tests/log/todo-tests.log
index c50f64f..bb60899 100644
--- a/tests/log/todo-tests.log
+++ b/tests/log/todo-tests.log
@@ -7,7 +7,7 @@ ok - use GPSTxml;
 # Running TODO tests...
 not ok - "../gpst -o csv multitrack.gpx" - Output csv format from multitrack.gpx # TODO Remove extra \n in the beginning
 #   Failed (TODO) test '"../gpst -o csv multitrack.gpx" - Output csv format from multitrack.gpx'
-#   in ./run-tests.pl at line 1865.
+#   in ./run-tests.pl at line 1860.
 #          got: '				
 # 2003-02-11T23:35:39Z	-0.1448824	51.4968266		
 # 2003-02-11T23:35:49Z	-0.1449938	51.4968227		
@@ -50,7 +50,7 @@ not ok - "../gpst -o csv multitrack.gpx" - Output csv format from multitrack.gpx
 ok - "../gpst -o csv multitrack.gpx" - Output csv format from multitrack.gpx (stderr) # TODO Remove extra \n in the beginning
 not ok - "../gpst -o csv pause.gpx" - Output csv format from pause.gpx # TODO Remove extra \n in the beginning
 #   Failed (TODO) test '"../gpst -o csv pause.gpx" - Output csv format from pause.gpx'
-#   in ./run-tests.pl at line 1865.
+#   in ./run-tests.pl at line 1860.
 #          got: '				
 # 2006-05-21T16:49:11Z	5.299534	60.425494	25.260	
 # 2006-05-21T16:49:46Z	5.299610	60.425464	24.931	
@@ -75,7 +75,7 @@ not ok - "../gpst -o csv pause.gpx" - Output csv format from pause.gpx # TODO Re
 ok - "../gpst -o csv pause.gpx" - Output csv format from pause.gpx (stderr) # TODO Remove extra \n in the beginning
 not ok - "../gpst -e -o csv pause.gpx" - csv format with epoch seconds from gpx # TODO Remove extra \n in the beginning
 #   Failed (TODO) test '"../gpst -e -o csv pause.gpx" - csv format with epoch seconds from gpx'
-#   in ./run-tests.pl at line 1865.
+#   in ./run-tests.pl at line 1860.
 #          got: '				
 # 1148230151	5.299534	60.425494	25.260	
 # 1148230186	5.299610	60.425464	24.931	
@@ -100,7 +100,7 @@ not ok - "../gpst -e -o csv pause.gpx" - csv format with epoch seconds from gpx
 ok - "../gpst -e -o csv pause.gpx" - csv format with epoch seconds from gpx (stderr) # TODO Remove extra \n in the beginning
 not ok - "../gpst -o gpx multitrack-pause.gpsml" - Should be equal to multitrack-pause.gpx # TODO Tweak output
 #   Failed (TODO) test '"../gpst -o gpx multitrack-pause.gpsml" - Should be equal to multitrack-pause.gpx'
-#   in ./run-tests.pl at line 1865.
+#   in ./run-tests.pl at line 1860.
 #          got: '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 # <gpx
 #   version="1.1"
@@ -188,7 +188,7 @@ ok - "../gpst -o gpx multitrack-pause.gpsml" - Should be equal to multitrack-pau
 GPX: Cannot open file '/home/sunny/gps/waypoints.gpx'!
 not ok - list_nearest_waypoints() # TODO Fix it.
 #   Failed (TODO) test 'list_nearest_waypoints()'
-#   in ./run-tests.pl at line 1837.
+#   in ./run-tests.pl at line 1832.
 #                   ''
 #     doesn't match '(?-xism:^\(.*,.*,.*\)$)'
 # Testing finished.
diff --git a/tests/run-tests.pl b/tests/run-tests.pl
index 39041d2..56ecf7d 100755
--- a/tests/run-tests.pl
+++ b/tests/run-tests.pl
@@ -637,12 +637,7 @@ likecmd("$CMD -h", # {{{
 );
 
 # }}}
-unlike(`$CMD -h`, # {{{
-    '/\$Id: /',
-    "\"$CMD -h\" - No Id with only -h",
-);
-
-# }}}
+ok(`$CMD -h` !~ /\$Id: /s, "\"$CMD -h\" - No Id with only -h");
 # --help option }}}
 diag("Testing --inside option..."); # {{{
 testcmd("../gpst --pos1 2.11,2.12 --pos2 3.31,3.32 --inside multitrack-pause.gpx", # {{{
-- 
2.11.4.GIT