empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: Normalize trailing white space in test output completely

Browse source 
Commit 37ff377 stripped trailing white space in test output, except
for journal.log, where it stripped it only from player output.  This
misses the space preceeding player empty output, and doesn't cover
equally annoying trailing white space elsewhere, such as the space
preceeding empty input and trailing white space in prompts.  Testing
the latter could be marginally useful, but let's keep things simple,
and strip all trailing white space for now.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-07 20:07:38 +01:00
parent 4dd38ddfe5
commit 3697a0a20b
4 changed files with 468 additions and 467 deletions
Download patch file Download diff file Expand all files Collapse all files

90
tests/actofgod/journal.log
View file

@ -755,14 +755,14 @@
Play#0 output Play#0 1 1 1 0 0 0 0 0 0 0 100 0 0 0 0 0 0 0 Play#0 output Play#0 1 1 1 0 0 0 0 0 0 0 100 0 0 0 0 0 0 0
Play#0 output Play#0 1 Mines <M>: 0 Play#0 output Play#0 1 Mines <M>: 0
Play#0 output Play#0 1 Road % <R>: 0 Rail % <r>: 0 Defense % <d>: 0 Play#0 output Play#0 1 Road % <R>: 0 Rail % <r>: 0 Defense % <d>: 0
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input m 2 Play#0 input m 2
Play#0 output Play#0 1 Mobility of 3,5 changed from 0 to 2 Play#0 output Play#0 1 Mobility of 3,5 changed from 0 to 2
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input a 1 Play#0 input a 1
Play#0 output Play#0 1 Available workforce of 3,5 changed from 0 to 1 Play#0 output Play#0 1 Available workforce of 3,5 changed from 0 to 1
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input Play#0 input
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit l 5,5 Play#0 input edit l 5,5
Play#0 command edit Play#0 command edit
@ -773,10 +773,10 @@
Play#0 output Play#0 1 1 1 0 0 0 0 0 0 0 100 0 0 0 0 0 0 0 Play#0 output Play#0 1 1 1 0 0 0 0 0 0 0 100 0 0 0 0 0 0 0
Play#0 output Play#0 1 Mines <M>: 0 Play#0 output Play#0 1 Mines <M>: 0
Play#0 output Play#0 1 Road % <R>: 0 Rail % <r>: 0 Defense % <d>: 0 Play#0 output Play#0 1 Road % <R>: 0 Rail % <r>: 0 Defense % <d>: 0
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input Play#0 input
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input Play#0 input
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit l 7:9,5 Play#0 input edit l 7:9,5
Play#0 command edit Play#0 command edit
@ -787,11 +787,11 @@
Play#0 output Play#0 1 1 1 0 0 0 0 0 0 0 100 0 0 0 0 0 0 0 Play#0 output Play#0 1 1 1 0 0 0 0 0 0 0 100 0 0 0 0 0 0 0
Play#0 output Play#0 1 Mines <M>: 0 Play#0 output Play#0 1 Mines <M>: 0
Play#0 output Play#0 1 Road % <R>: 0 Rail % <r>: 0 Defense % <d>: 0 Play#0 output Play#0 1 Road % <R>: 0 Rail % <r>: 0 Defense % <d>: 0
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input e 1 Play#0 input e 1
Play#0 output Play#0 1 Efficiency of 7,5 changed from 0 to 1 Play#0 output Play#0 1 Efficiency of 7,5 changed from 0 to 1
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input Play#0 input
Play#0 output Play#0 1 Location <L>: 9,5 Distribution sector <D>: 9,5 Play#0 output Play#0 1 Location <L>: 9,5 Distribution sector <D>: 9,5
Play#0 output Play#0 1 Designation <s>: - New designation <S>: - Play#0 output Play#0 1 Designation <s>: - New designation <S>: -
Play#0 output Play#0 1 own oo eff mob min gld frt oil urn wrk lty che ctg plg ptime fall avail Play#0 output Play#0 1 own oo eff mob min gld frt oil urn wrk lty che ctg plg ptime fall avail
@ -799,11 +799,11 @@
Play#0 output Play#0 1 1 1 0 0 0 0 0 0 0 100 0 0 0 0 0 0 0 Play#0 output Play#0 1 1 1 0 0 0 0 0 0 0 100 0 0 0 0 0 0 0
Play#0 output Play#0 1 Mines <M>: 0 Play#0 output Play#0 1 Mines <M>: 0
Play#0 output Play#0 1 Road % <R>: 0 Rail % <r>: 0 Defense % <d>: 0 Play#0 output Play#0 1 Road % <R>: 0 Rail % <r>: 0 Defense % <d>: 0
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input e 2 Play#0 input e 2
Play#0 output Play#0 1 Efficiency of 9,5 changed from 0 to 2 Play#0 output Play#0 1 Efficiency of 9,5 changed from 0 to 2
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input Play#0 input
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input give l 2,6 -2147483648 Play#0 input give l 2,6 -2147483648
Play#0 command give Play#0 command give
@ -831,7 +831,7 @@
Play#0 output Play#0 1 2 -2,2 - 0% 0 0 0 0 0 Play#0 output Play#0 1 2 -2,2 - 0% 0 0 0 0 0
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 3 2,-2 - 0% 0 0 0 0 0 Play#0 output Play#0 1 3 2,-2 - 0% 0 0 0 0 0
Play#0 output Play#0 4 Are you sure these are the two sectors you wish to swap? Play#0 output Play#0 4 Are you sure these are the two sectors you wish to swap?
Play#0 input y Play#0 input y
Play#0 output Play#0 1 done Play#0 output Play#0 1 done
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
@ -1483,17 +1483,17 @@
Play#0 output Play#0 1 civ mil uw food shl gun pet irn dst oil lcm hcm rad Play#0 output Play#0 1 civ mil uw food shl gun pet irn dst oil lcm hcm rad
Play#0 output Play#0 1 c m u f s g p i d o l h r Play#0 output Play#0 1 c m u f s g p i d o l h r
Play#0 output Play#0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input M 2 Play#0 input M 2
Play#0 output Play#0 1 Mobility of cs cargo ship (#0) changed from 0 to 2 Play#0 output Play#0 1 Mobility of cs cargo ship (#0) changed from 0 to 2
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input m 1 Play#0 input m 1
Play#0 output Play#0 1 military of cs cargo ship (#0) changed from 0 to 1 Play#0 output Play#0 1 military of cs cargo ship (#0) changed from 0 to 1
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input f 1 Play#0 input f 1
Play#0 output Play#0 1 food of cs cargo ship (#0) changed from 0 to 1 Play#0 output Play#0 1 food of cs cargo ship (#0) changed from 0 to 1
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input Play#0 input
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit s 0 Play#0 input edit s 0
Play#0 command edit Play#0 command edit
@ -1507,14 +1507,14 @@
Play#0 output Play#0 1 civ mil uw food shl gun pet irn dst oil lcm hcm rad Play#0 output Play#0 1 civ mil uw food shl gun pet irn dst oil lcm hcm rad
Play#0 output Play#0 1 c m u f s g p i d o l h r Play#0 output Play#0 1 c m u f s g p i d o l h r
Play#0 output Play#0 1 0 1 0 1 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 0 1 0 1 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input R n Play#0 input R n
Play#0 output Play#0 1 Retreat path of cs cargo ship (#0) changed from to n Play#0 output Play#0 1 Retreat path of cs cargo ship (#0) changed from to n
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input R "" Play#0 input R ""
Play#0 output Play#0 1 Retreat path of cs cargo ship (#0) changed from n to Play#0 output Play#0 1 Retreat path of cs cargo ship (#0) changed from n to
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input Play#0 input
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit p 0 Play#0 input edit p 0
Play#0 command edit Play#0 command edit
@ -1525,14 +1525,14 @@
Play#0 output Play#0 1 Tech <t>: 100 Wing <w>: Play#0 output Play#0 1 Tech <t>: 100 Wing <w>:
Play#0 output Play#0 1 Range <r>: 9 Flags <f>: 0 Play#0 output Play#0 1 Range <r>: 9 Flags <f>: 0
Play#0 output Play#0 1 Ship <s>: -1 Land Unit <y>: -1 Play#0 output Play#0 1 Ship <s>: -1 Land Unit <y>: -1
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input m 2 Play#0 input m 2
Play#0 output Play#0 1 Mobility of f1 Sopwith Camel #0 changed from 0 to 2 Play#0 output Play#0 1 Mobility of f1 Sopwith Camel #0 changed from 0 to 2
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input y -1 Play#0 input y -1
Play#0 output Play#0 1 Land unit of f1 Sopwith Camel #0 unchanged Play#0 output Play#0 1 Land unit of f1 Sopwith Camel #0 unchanged
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input Play#0 input
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit u 0 Play#0 input edit u 0
Play#0 command edit Play#0 command edit
@ -1548,14 +1548,14 @@
Play#0 output Play#0 1 civ mil uw food shl gun pet irn dst oil lcm hcm rad Play#0 output Play#0 1 civ mil uw food shl gun pet irn dst oil lcm hcm rad
Play#0 output Play#0 1 c m u f s g p i d o l h r Play#0 output Play#0 1 c m u f s g p i d o l h r
Play#0 output Play#0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input M 2 Play#0 input M 2
Play#0 output Play#0 1 Mobility of sup supply #0 changed from 0 to 2 Play#0 output Play#0 1 Mobility of sup supply #0 changed from 0 to 2
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input Y -1 Play#0 input Y -1
Play#0 output Play#0 1 Land unit of sup supply #0 unchanged Play#0 output Play#0 1 Land unit of sup supply #0 unchanged
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input Play#0 input
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit n 0 Play#0 input edit n 0
Play#0 command edit Play#0 command edit
@ -1564,14 +1564,14 @@
Play#0 output Play#0 1 Owner <O>: 0 Location <L>: 1,-1 Play#0 output Play#0 1 Owner <O>: 0 Location <L>: 1,-1
Play#0 output Play#0 1 Tech <T>: 400 Stockpile <S>: Play#0 output Play#0 1 Tech <T>: 400 Stockpile <S>:
Play#0 output Play#0 1 Plane <p>: -1 Play#0 output Play#0 1 Plane <p>: -1
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input S a Play#0 input S a
Play#0 output Play#0 1 Assignment of 10kt fission warhead #0 changed from stockpile ~ to a Play#0 output Play#0 1 Assignment of 10kt fission warhead #0 changed from stockpile ~ to a
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input p -1 Play#0 input p -1
Play#0 output Play#0 1 Plane of 10kt fission warhead #0 unchanged Play#0 output Play#0 1 Plane of 10kt fission warhead #0 unchanged
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input Play#0 input
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit c 0 @ 0 Play#0 input edit c 0 @ 0
Play#0 command edit Play#0 command edit
@ -1749,14 +1749,14 @@
Play#0 output Play#0 1 Education <E>: 0.00 Happiness <H>: 0.00 Play#0 output Play#0 1 Education <E>: 0.00 Happiness <H>: 0.00
Play#0 output Play#0 1 Money <M>: $ 0 Play#0 output Play#0 1 Money <M>: $ 0
Play#0 output Play#0 1 Telegrams <t>: 1 Play#0 output Play#0 1 Telegrams <t>: 1
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input b 640 Play#0 input b 640
Play#0 output Play#0 1 BTUs of 5 (#5) changed from 0 to 640 Play#0 output Play#0 1 BTUs of 5 (#5) changed from 0 to 640
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input T 1 Play#0 input T 1
Play#0 output Play#0 1 Technology of 5 (#5) changed from 0.00 to 1.00 Play#0 output Play#0 1 Technology of 5 (#5) changed from 0.00 to 1.00
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input Play#0 input
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input read 0 Play#0 input read 0
Play#0 command read Play#0 command read
@ -1764,7 +1764,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input read 1 Play#0 input read 1
Play#0 command read Play#0 command read
Play#0 output Play#0 1 Play#0 output Play#0 1
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 Sector 1,7 taken from you by an act of POGO! Play#0 output Play#0 1 Sector 1,7 taken from you by an act of POGO!
Play#0 output Play#0 1 Sector 3,7 taken from you by an act of POGO! Play#0 output Play#0 1 Sector 3,7 taken from you by an act of POGO!
@ -1905,7 +1905,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input read 2 Play#0 input read 2
Play#0 command read Play#0 command read
Play#0 output Play#0 1 Play#0 output Play#0 1
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 Sector 5,7 given to you by an act of POGO! Play#0 output Play#0 1 Sector 5,7 given to you by an act of POGO!
Play#0 output Play#0 1 Sector 11,7 given to you by an act of POGO! Play#0 output Play#0 1 Sector 11,7 given to you by an act of POGO!
@ -1939,7 +1939,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input read 3 Play#0 input read 3
Play#0 command read Play#0 command read
Play#0 output Play#0 1 Play#0 output Play#0 1
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 Sector 1,-7 taken from you by an act of POGO! Play#0 output Play#0 1 Sector 1,-7 taken from you by an act of POGO!
Play#0 output Play#0 1 Old owner of 1,-3 changed from 3 (#3) to 1 (#1) by an act of POGO Play#0 output Play#0 1 Old owner of 1,-3 changed from 3 (#3) to 1 (#1) by an act of POGO
@ -2043,7 +2043,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input read 4 Play#0 input read 4
Play#0 command read Play#0 command read
Play#0 output Play#0 1 Play#0 output Play#0 1
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 BTUs changed from 0 to 640 by an act of POGO! Play#0 output Play#0 1 BTUs changed from 0 to 640 by an act of POGO!
Play#0 output Play#0 1 Number of seconds used changed from 0 to 86400 by an act of POGO! Play#0 output Play#0 1 Number of seconds used changed from 0 to 86400 by an act of POGO!
@ -2051,7 +2051,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input read 5 Play#0 input read 5
Play#0 command read Play#0 command read
Play#0 output Play#0 1 Play#0 output Play#0 1
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 Status changed to deity by an act of POGO! Play#0 output Play#0 1 Status changed to deity by an act of POGO!
Play#0 output Play#0 1 BTUs changed from 0 to 640 by an act of POGO! Play#0 output Play#0 1 BTUs changed from 0 to 640 by an act of POGO!
@ -2059,7 +2059,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input read 98 Play#0 input read 98
Play#0 command read Play#0 command read
Play#0 output Play#0 1 Play#0 output Play#0 1
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 Sector 3,7 given to you by an act of POGO! Play#0 output Play#0 1 Sector 3,7 given to you by an act of POGO!
Play#0 output Play#0 1 Old owner of 3,7 changed from 1 (#1) to 98 (#98) by an act of POGO Play#0 output Play#0 1 Old owner of 3,7 changed from 1 (#1) to 98 (#98) by an act of POGO

68
tests/fire/journal.log
View file

@ -54,19 +54,19 @@
Play#1 output Play#1 6 0 637 Play#1 output Play#1 6 0 637
Play#1 input fire se 0,0 0,0 Play#1 input fire se 0,0 0,0
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 0,0 firing Play#1 output Play#1 1 Sector 0,0 firing
Play#1 output Play#1 1 You can't fire upon yourself! Play#1 output Play#1 1 You can't fire upon yourself!
Play#1 output Play#1 6 0 636 Play#1 output Play#1 6 0 636
Play#1 input fire se 0,0 1,0 Play#1 input fire se 0,0 1,0
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 0,0 firing Play#1 output Play#1 1 Sector 0,0 firing
Play#1 output Play#1 1 No such sector exists! Play#1 output Play#1 1 No such sector exists!
Play#1 output Play#1 6 0 635 Play#1 output Play#1 6 0 635
Play#1 input fire se 0,0 666 Play#1 input fire se 0,0 666
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 0,0 firing Play#1 output Play#1 1 Sector 0,0 firing
Play#1 output Play#1 1 No such ship exists! Play#1 output Play#1 1 No such ship exists!
Play#1 output Play#1 6 0 634 Play#1 output Play#1 6 0 634
@ -114,42 +114,42 @@
Play#1 output Play#1 6 0 625 Play#1 output Play#1 6 0 625
Play#1 input fire se 4,0 -12,0 Play#1 input fire se 4,0 -12,0
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 5.00 (4.50) Play#1 output Play#1 1 range is 5.00 (4.50)
Play#1 output Play#1 1 Target out of range. Play#1 output Play#1 1 Target out of range.
Play#1 output Play#1 6 0 624 Play#1 output Play#1 6 0 624
Play#1 input fire se 4,0 0 Play#1 input fire se 4,0 0
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 5.00 (4.50) Play#1 output Play#1 1 range is 5.00 (4.50)
Play#1 output Play#1 1 Target out of range. Play#1 output Play#1 1 Target out of range.
Play#1 output Play#1 6 0 623 Play#1 output Play#1 6 0 623
Play#1 input fire se 4,0 13 Play#1 input fire se 4,0 13
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 Target out of range. Play#1 output Play#1 1 Target out of range.
Play#1 output Play#1 6 0 622 Play#1 output Play#1 6 0 622
Play#1 input fire se 4,0 12 Play#1 input fire se 4,0 12
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 5.00 (4.50) Play#1 output Play#1 1 range is 5.00 (4.50)
Play#1 output Play#1 1 Target out of range. Play#1 output Play#1 1 Target out of range.
Play#1 output Play#1 6 0 621 Play#1 output Play#1 6 0 621
Play#1 input fire se 4,0 14,0 Play#1 input fire se 4,0 14,0
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 Target out of range. Play#1 output Play#1 1 Target out of range.
Play#1 output Play#1 6 0 620 Play#1 output Play#1 6 0 620
Play#1 input fire se 4,0 14,0 Play#1 input fire se 4,0 14,0
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 5.00 (4.50) Play#1 output Play#1 1 range is 5.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -157,14 +157,14 @@
Play#1 output Play#1 6 0 619 Play#1 output Play#1 6 0 619
Play#1 input fire se 4,0 14,0 Play#1 input fire se 4,0 14,0
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 Target out of range. Play#1 output Play#1 1 Target out of range.
Play#1 output Play#1 6 0 618 Play#1 output Play#1 6 0 618
Play#1 input fire se 4,0 14,0 Play#1 input fire se 4,0 14,0
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 5.00 (4.50) Play#1 output Play#1 1 range is 5.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -172,14 +172,14 @@
Play#1 output Play#1 6 0 617 Play#1 output Play#1 6 0 617
Play#1 input fire se 4,0 14,0 Play#1 input fire se 4,0 14,0
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 Target out of range. Play#1 output Play#1 1 Target out of range.
Play#1 output Play#1 6 0 616 Play#1 output Play#1 6 0 616
Play#1 input fire se 4,0 14,0 Play#1 input fire se 4,0 14,0
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 5.00 (4.50) Play#1 output Play#1 1 range is 5.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -187,7 +187,7 @@
Play#1 output Play#1 6 0 615 Play#1 output Play#1 6 0 615
Play#1 input fire se 4,0 2,-2 Play#1 input fire se 4,0 2,-2
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -200,7 +200,7 @@
Play#1 output Play#1 6 0 613 Play#1 output Play#1 6 0 613
Play#1 input fire se 0,0 -2,-2 Play#1 input fire se 0,0 -2,-2
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 0,0 firing Play#1 output Play#1 1 Sector 0,0 firing
Play#1 output Play#1 1 range is 3.00 (3.50) Play#1 output Play#1 1 range is 3.00 (3.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -208,7 +208,7 @@
Play#1 output Play#1 6 0 612 Play#1 output Play#1 6 0 612
Play#1 input fire se 2,0 -2,-2 Play#1 input fire se 2,0 -2,-2
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 2,0 firing Play#1 output Play#1 1 Sector 2,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -216,7 +216,7 @@
Play#1 output Play#1 6 0 611 Play#1 output Play#1 6 0 611
Play#1 input fire se 4,0 -2,-2 Play#1 input fire se 4,0 -2,-2
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -224,7 +224,7 @@
Play#1 output Play#1 6 0 610 Play#1 output Play#1 6 0 610
Play#1 input fire se 0,0 4,2 Play#1 input fire se 0,0 4,2
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 0,0 firing Play#1 output Play#1 1 Sector 0,0 firing
Play#1 output Play#1 1 range is 4.00 (3.50) Play#1 output Play#1 1 range is 4.00 (3.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -232,7 +232,7 @@
Play#1 output Play#1 6 0 609 Play#1 output Play#1 6 0 609
Play#1 input fire se 2,0 4,2 Play#1 input fire se 2,0 4,2
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 2,0 firing Play#1 output Play#1 1 Sector 2,0 firing
Play#1 output Play#1 1 range is 5.00 (4.50) Play#1 output Play#1 1 range is 5.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -240,7 +240,7 @@
Play#1 output Play#1 6 0 608 Play#1 output Play#1 6 0 608
Play#1 input fire se 4,0 1,3 Play#1 input fire se 4,0 1,3
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -248,7 +248,7 @@
Play#1 output Play#1 6 0 607 Play#1 output Play#1 6 0 607
Play#1 input fire se 0,0 2,2 Play#1 input fire se 0,0 2,2
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 0,0 firing Play#1 output Play#1 1 Sector 0,0 firing
Play#1 output Play#1 1 range is 3.00 (3.50) Play#1 output Play#1 1 range is 3.00 (3.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -256,7 +256,7 @@
Play#1 output Play#1 6 0 606 Play#1 output Play#1 6 0 606
Play#1 input fire se 2,0 2,2 Play#1 input fire se 2,0 2,2
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 2,0 firing Play#1 output Play#1 1 Sector 2,0 firing
Play#1 output Play#1 1 range is 5.00 (4.50) Play#1 output Play#1 1 range is 5.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -264,7 +264,7 @@
Play#1 output Play#1 6 0 605 Play#1 output Play#1 6 0 605
Play#1 input fire se 4,0 2,2 Play#1 input fire se 4,0 2,2
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -272,7 +272,7 @@
Play#1 output Play#1 6 0 604 Play#1 output Play#1 6 0 604
Play#1 input fire se 0,0 9 Play#1 input fire se 0,0 9
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 0,0 firing Play#1 output Play#1 1 Sector 0,0 firing
Play#1 output Play#1 1 range is 4.00 (3.50) Play#1 output Play#1 1 range is 4.00 (3.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -281,7 +281,7 @@
Play#1 output Play#1 6 0 603 Play#1 output Play#1 6 0 603
Play#1 input fire se 0,0 23 Play#1 input fire se 0,0 23
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 0,0 firing Play#1 output Play#1 1 Sector 0,0 firing
Play#1 output Play#1 1 range is 3.00 (3.50) Play#1 output Play#1 1 range is 3.00 (3.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -289,7 +289,7 @@
Play#1 output Play#1 6 0 602 Play#1 output Play#1 6 0 602
Play#1 input fire se 2,0 23 Play#1 input fire se 2,0 23
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 2,0 firing Play#1 output Play#1 1 Sector 2,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -297,7 +297,7 @@
Play#1 output Play#1 6 0 601 Play#1 output Play#1 6 0 601
Play#1 input fire se 4,0 23 Play#1 input fire se 4,0 23
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -305,7 +305,7 @@
Play#1 output Play#1 6 0 600 Play#1 output Play#1 6 0 600
Play#1 input fire se 4,0 21 Play#1 input fire se 4,0 21
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 5.00 (4.50) Play#1 output Play#1 1 range is 5.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -314,7 +314,7 @@
Play#1 output Play#1 6 0 599 Play#1 output Play#1 6 0 599
Play#1 input fire se 0,0 22 Play#1 input fire se 0,0 22
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 0,0 firing Play#1 output Play#1 1 Sector 0,0 firing
Play#1 output Play#1 1 range is 3.00 (3.50) Play#1 output Play#1 1 range is 3.00 (3.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -322,7 +322,7 @@
Play#1 output Play#1 6 0 598 Play#1 output Play#1 6 0 598
Play#1 input fire se 2,0 22 Play#1 input fire se 2,0 22
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 2,0 firing Play#1 output Play#1 1 Sector 2,0 firing
Play#1 output Play#1 1 range is 4.00 (4.50) Play#1 output Play#1 1 range is 4.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -330,7 +330,7 @@
Play#1 output Play#1 6 0 597 Play#1 output Play#1 6 0 597
Play#1 input fire se 4,0 22 Play#1 input fire se 4,0 22
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 5.00 (4.50) Play#1 output Play#1 1 range is 5.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -338,7 +338,7 @@
Play#1 output Play#1 6 0 596 Play#1 output Play#1 6 0 596
Play#1 input fire se 4,0 20 Play#1 input fire se 4,0 20
Play#1 command fire Play#1 command fire
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Sector 4,0 firing Play#1 output Play#1 1 Sector 4,0 firing
Play#1 output Play#1 1 range is 5.00 (4.50) Play#1 output Play#1 1 range is 5.00 (4.50)
Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 \007Kaboom!!!
@ -1198,7 +1198,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input read 1 Play#0 input read 1
Play#0 command read Play#0 command read
Play#0 output Play#0 1 Play#0 output Play#0 1
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#9) in 3,1 for 0 damage. Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#9) in 3,1 for 0 damage.
Play#0 output Play#0 1 BTUs changed from 595 to 640 by an act of POGO! Play#0 output Play#0 1 BTUs changed from 595 to 640 by an act of POGO!
@ -1206,7 +1206,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input read 2 Play#0 input read 2
Play#0 command read Play#0 command read
Play#0 output Play#0 1 Play#0 output Play#0 1
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 Country #1 shelled sector 4,2 for 0 damage. Play#0 output Play#0 1 Country #1 shelled sector 4,2 for 0 damage.
Play#0 output Play#0 1 Country #1 shelled sector 4,2 for 3 damage. Play#0 output Play#0 1 Country #1 shelled sector 4,2 for 3 damage.

9
tests/normalize.pl
View file

@ -37,6 +37,11 @@ while (<>) {
$_ = substr($_, 25); $_ = substr($_, 25);
} }
# Strip trailing white space
# We don't really care for it in test output, and git's pre-commit
# hook flags it, which is annoying.
s/\s+$//;
# Split off prefix that is not to be normalized # Split off prefix that is not to be normalized
my $pfx = ''; my $pfx = '';
if ($opt_j) { if ($opt_j) {
@ -118,10 +123,6 @@ while (<>) {
# Windows %#g prints it with seven significant digits instead of six # Windows %#g prints it with seven significant digits instead of six
s/ 0\.000000/ 0.00000/g s/ 0\.000000/ 0.00000/g
if $dump =~ /^[a-z]/; if $dump =~ /^[a-z]/;
### Trailing white space
# We don't really care for it in test output, and git's pre-commit
# hook flags it, which is annoying.
s/\s+$//;
print "$pfx$_\n"; print "$pfx$_\n";

768
tests/smoke/journal.log
View file

File diff suppressed because it is too large Load diff