Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions regression/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ $(TEST_FILES):
$(_V) echo "Running test $@"
$(_V) mkdir -p output nml_output output2
# First pass : check compilation of source nml and generation of optimised nml
$(_V) $(NMLC) $(NML_FLAGS) --nfo output/$@.nfo --grf output/$@.grf $@.nml --nml nml_output/$@.nml
$(_V) $(NMLC) $(NML_FLAGS) --nfo output/$@.nfo --grf output/$@.grf $@.nml --nml nml_output/$@.nml > output/$@.txt 2>&1
$(_V) diff -u --strip-trailing-cr expected/$@.nfo output/$@.nfo
$(_V) diff -u --strip-trailing-cr expected/$@.txt output/$@.txt
$(_V) diff expected/$@.grf output/$@.grf
# Second pass : check compilation of optimised nml
$(_V) $(NMLC) $(NML_FLAGS) -n --nfo output2/$@.nfo --grf output2/$@.grf nml_output/$@.nml
Expand All @@ -37,8 +38,9 @@ $(EXAMPLES):
--nfo ../../regression/output/example_$@.nfo \
--nml ../../regression/nml_output/example_$@.nml \
--grf ../../regression/output/example_$@.grf \
example_$@.nml && cd ../../regression
example_$@.nml > ../../regression/output/example_$@.txt 2>&1 && cd ../../regression
$(_V) diff -u --strip-trailing-cr expected/example_$@.nfo output/example_$@.nfo
$(_V) diff -u --strip-trailing-cr expected/example_$@.txt output/example_$@.txt
$(_V) diff expected/example_$@.grf output/example_$@.grf
# Second pass
$(_V) cd ../examples/$@/ && \
Expand Down
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file added regression/expected/026_asl.txt
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
1 change: 1 addition & 0 deletions regression/expected/037_optimised_trigger.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nmlc warning: "037_optimised_trigger.nml", line 9: Block 'unconditional_switch' returns a constant, optimising.
6 changes: 6 additions & 0 deletions regression/expected/038_optimised_scope.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
nmlc warning: "038_optimised_scope.nml", line 14: Block 'color_unconditional' returns a constant, optimising.
nmlc warning: "038_optimised_scope.nml", line 19: Block 'color_indirect1' returns a constant, optimising.
nmlc warning: "038_optimised_scope.nml", line 24: Block 'color_indirect0' returns a constant, optimising.
nmlc warning: "038_optimised_scope.nml", line 29: Block 'color_indirect' returns a constant, optimising.
nmlc warning: "038_optimised_scope.nml", line 45: Block 'mixed_scope_capacity' returns a constant, optimising.
nmlc warning: "038_optimised_scope.nml", line 39: Block 'text' returns a constant, optimising.
Empty file.
3 changes: 3 additions & 0 deletions regression/expected/040_station.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nmlc warning: "040_station.nml", line 130: Redefinition of layout 1x1
nmlc warning: "040_station.nml", line 134: Invalid tile 5 in layout 2x2
nmlc warning: "040_station.nml", line 135: Invalid tile 7 in layout 2x2
Empty file.
Empty file.
1 change: 1 addition & 0 deletions regression/expected/043_name_case.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nmlc warning: "043_name_case.nml", line 13: Item with name 'item_mu_mu_wagon_unpowered' similar to existing name 'item_mu_MU_Wagon_Unpowered'
Empty file.
Empty file.
Empty file.
1 change: 1 addition & 0 deletions regression/expected/example_road_vehicle.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nmlc warning: "example_road_vehicle.nml", line 341: 'SOUND_BUS_START_PULL_AWAY' is deprecated, consider using 'SOUND_DEPARTURE_OLD_RV_1' instead
Empty file.
1 change: 1 addition & 0 deletions regression/expected/example_station.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nmlc warning: "example_station.nml", line 58: "cows_cargo.png" at [x: 150, y: 10]: 3 of 4160 pixels (0%) are animated, but ANIM isn't in flags
Empty file.
Loading