From af72ecd75fc5039ba24453f7065b737b28b7c1b1 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 12 Aug 2017 09:21:03 +0200 Subject: [PATCH] tests: Normalize version numbers to 4.4.0 instead of 4.3.34 Commit 1ec9b94 normalized version numbers in test output to 4.3.34, because that was thought to be the next version then. 4.3.34 has become 4.4.0 meanwhile. Update the normalization just to avoid mention of 4.3.34. Signed-off-by: Markus Armbruster --- tests/normalize.pl | 2 +- tests/version/journal.log | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/normalize.pl b/tests/normalize.pl index 734604c5b..9330f692d 100755 --- a/tests/normalize.pl +++ b/tests/normalize.pl @@ -91,7 +91,7 @@ while (<>) { or /^[0-9]+ (sector|ship|plane|unit|nuke|lost item)/)); ### Version - s/(Wolfpack( |\\\\040)Empire( |\\\\040))[0-9][^ "]*/${1}4.3.34/; + s/(Wolfpack( |\\\\040)Empire( |\\\\040))[0-9][^ "]*/${1}4.4.0/; ### Formatted time # nat_timeused in prompt s/^\[[0-9]+(:[0-9]+\] Command \:)/[0$1/; diff --git a/tests/version/journal.log b/tests/version/journal.log index 980624f8d..152f05e1e 100644 --- a/tests/version/journal.log +++ b/tests/version/journal.log @@ -22,7 +22,7 @@ Play#0 output Play#0 6 0 640 Play#0 input version Play#0 command version - Play#0 output Play#0 1 Wolfpack Empire 4.3.34 + Play#0 output Play#0 1 Wolfpack Empire 4.4.0 Play#0 output Play#0 1 Play#0 output Play#0 1 The following parameters have been set for this game: Play#0 output Play#0 1 World size is 64 by 32. @@ -1903,7 +1903,7 @@ Play#0 input xdump version * Play#0 command xdump Play#0 output Play#0 1 XDUMP version 0 - Play#0 output Play#0 1 "Wolfpack\\040Empire\\0404.3.34" 99 "Deity\\040forgot\\040to\\040edit\\040econfig" "careless@invalid" 64 32 60 0 0 1 "" "" "" 1 0 1 0 1 1 0 0 0 0 1 0 0 0 0 1 1 0 1 1 0 0 0 0.00120000 1440 640 15 5 120 0 1.00000 96.0000 2.00000 2.00000 192.000 48.0000 600000. 600000. 1.00000 127 100 1000.00 10.0000 300 3000.00 100.000 1.00000 2.00000 127 -0.00100000 1.00000 2.00000 127 -0.00100000 1.50000 3.00000 127 -0.00100000 40 8 8 8 1.75000 5.00000 1.00000 0.300000 0.100000 0.500000 1.00000 2 0.00250000 0.00833330 -0.0833333 -0.00833330 0.00177770 0.00600000 0.250000 0.000500000 0.00130000 0.00120000 0.00500000 50 0.00600000 0.00500000 0.00000 7200 7200 1.00000 0.990000 8 14 25 0.0250000 0.0350000 0.0500000 0.200000 0.100000 + Play#0 output Play#0 1 "Wolfpack\\040Empire\\0404.4.0" 99 "Deity\\040forgot\\040to\\040edit\\040econfig" "careless@invalid" 64 32 60 0 0 1 "" "" "" 1 0 1 0 1 1 0 0 0 0 1 0 0 0 0 1 1 0 1 1 0 0 0 0.00120000 1440 640 15 5 120 0 1.00000 96.0000 2.00000 2.00000 192.000 48.0000 600000. 600000. 1.00000 127 100 1000.00 10.0000 300 3000.00 100.000 1.00000 2.00000 127 -0.00100000 1.00000 2.00000 127 -0.00100000 1.50000 3.00000 127 -0.00100000 40 8 8 8 1.75000 5.00000 1.00000 0.300000 0.100000 0.500000 1.00000 2 0.00250000 0.00833330 -0.0833333 -0.00833330 0.00177770 0.00600000 0.250000 0.000500000 0.00130000 0.00120000 0.00500000 50 0.00600000 0.00500000 0.00000 7200 7200 1.00000 0.990000 8 14 25 0.0250000 0.0350000 0.0500000 0.200000 0.100000 Play#0 output Play#0 1 /1 Play#0 output Play#0 6 0 640 Play#0 input xdump meta * @@ -2554,7 +2554,7 @@ Play#1 input xdump version * Play#1 command xdump Play#1 output Play#1 1 XDUMP version 0 - Play#1 output Play#1 1 "Wolfpack\\040Empire\\0404.3.34" 99 "Deity\\040forgot\\040to\\040edit\\040econfig" "careless@invalid" 64 32 60 0 0 1 "" "" "" 1 0 1 0 1 1 0 0 0 0 1 0 0 0 0 1 1 0 1 1 0 0 0 0.00120000 1440 640 15 5 120 0 1.00000 96.0000 2.00000 2.00000 192.000 48.0000 600000. 600000. 1.00000 127 100 1000.00 10.0000 300 3000.00 100.000 1.00000 2.00000 127 -0.00100000 1.00000 2.00000 127 -0.00100000 1.50000 3.00000 127 -0.00100000 40 8 8 8 1.75000 5.00000 1.00000 0.300000 0.100000 0.500000 1.00000 2 0.00250000 0.00833330 -0.0833333 -0.00833330 0.00177770 0.00600000 0.250000 0.000500000 0.00130000 0.00120000 0.00500000 50 0.00600000 0.00500000 0.00000 7200 7200 1.00000 0.990000 8 14 25 0.0250000 0.0350000 0.0500000 0.200000 0.100000 + Play#1 output Play#1 1 "Wolfpack\\040Empire\\0404.4.0" 99 "Deity\\040forgot\\040to\\040edit\\040econfig" "careless@invalid" 64 32 60 0 0 1 "" "" "" 1 0 1 0 1 1 0 0 0 0 1 0 0 0 0 1 1 0 1 1 0 0 0 0.00120000 1440 640 15 5 120 0 1.00000 96.0000 2.00000 2.00000 192.000 48.0000 600000. 600000. 1.00000 127 100 1000.00 10.0000 300 3000.00 100.000 1.00000 2.00000 127 -0.00100000 1.00000 2.00000 127 -0.00100000 1.50000 3.00000 127 -0.00100000 40 8 8 8 1.75000 5.00000 1.00000 0.300000 0.100000 0.500000 1.00000 2 0.00250000 0.00833330 -0.0833333 -0.00833330 0.00177770 0.00600000 0.250000 0.000500000 0.00130000 0.00120000 0.00500000 50 0.00600000 0.00500000 0.00000 7200 7200 1.00000 0.990000 8 14 25 0.0250000 0.0350000 0.0500000 0.200000 0.100000 Play#1 output Play#1 1 /1 Play#1 output Play#1 6 0 0 Play#1 input xdump meta * @@ -2818,7 +2818,7 @@ Play#2 output Play#2 6 0 640 Play#2 input version Play#2 command version - Play#2 output Play#2 1 Wolfpack Empire 4.3.34 + Play#2 output Play#2 1 Wolfpack Empire 4.4.0 Play#2 output Play#2 1 Play#2 output Play#2 1 The following parameters have been set for this game: Play#2 output Play#2 1 World size is 64 by 32. @@ -2931,7 +2931,7 @@ Play#1 output Play#1 6 0 0 Play#1 input version Play#1 command version - Play#1 output Play#1 1 Wolfpack Empire 4.3.34 + Play#1 output Play#1 1 Wolfpack Empire 4.4.0 Play#1 output Play#1 1 Play#1 output Play#1 1 The following parameters have been set for this game: Play#1 output Play#1 1 World size is 64 by 32. -- 2.43.0