diff --git a/regression/Makefile b/regression/Makefile index 11825c5e..190731b9 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -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 @@ -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/$@/ && \ diff --git a/regression/expected/001_action8.txt b/regression/expected/001_action8.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/002_sounds.txt b/regression/expected/002_sounds.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/003_assignment.txt b/regression/expected/003_assignment.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/004_deactivate.txt b/regression/expected/004_deactivate.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/005_error.txt b/regression/expected/005_error.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/006_vehicle.txt b/regression/expected/006_vehicle.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/007_townnames.txt b/regression/expected/007_townnames.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/008_railtypes.txt b/regression/expected/008_railtypes.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/009_replace.txt b/regression/expected/009_replace.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/010_liveryoverride.txt b/regression/expected/010_liveryoverride.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/011_snowline.txt b/regression/expected/011_snowline.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/012_basecost.txt b/regression/expected/012_basecost.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/013_train_callback.txt b/regression/expected/013_train_callback.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/014_read_special_param.txt b/regression/expected/014_read_special_param.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/015_basic_object.txt b/regression/expected/015_basic_object.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/016_basic_airporttiles.txt b/regression/expected/016_basic_airporttiles.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/017_articulated_tram.txt b/regression/expected/017_articulated_tram.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/018_airport_tile.txt b/regression/expected/018_airport_tile.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/019_switch.txt b/regression/expected/019_switch.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/020_recolour.txt b/regression/expected/020_recolour.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/021_grf_parameter.txt b/regression/expected/021_grf_parameter.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/022_disable_item.txt b/regression/expected/022_disable_item.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/023_engine_override.txt b/regression/expected/023_engine_override.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/024_conditional.txt b/regression/expected/024_conditional.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/025_loop.txt b/regression/expected/025_loop.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/026_asl.txt b/regression/expected/026_asl.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/027_airport_layout.txt b/regression/expected/027_airport_layout.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/028_font.txt b/regression/expected/028_font.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/029_base_graphics.txt b/regression/expected/029_base_graphics.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/030_house.txt b/regression/expected/030_house.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/031_aircraft.txt b/regression/expected/031_aircraft.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/032_simple_house.txt b/regression/expected/032_simple_house.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/033_procedure.txt b/regression/expected/033_procedure.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/034_roadtypes.txt b/regression/expected/034_roadtypes.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/035_switch_scope.txt b/regression/expected/035_switch_scope.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/036_procedure_scope.txt b/regression/expected/036_procedure_scope.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/037_optimised_trigger.txt b/regression/expected/037_optimised_trigger.txt new file mode 100644 index 00000000..c37f2f7d --- /dev/null +++ b/regression/expected/037_optimised_trigger.txt @@ -0,0 +1 @@ + nmlc warning: "037_optimised_trigger.nml", line 9: Block 'unconditional_switch' returns a constant, optimising. diff --git a/regression/expected/038_optimised_scope.txt b/regression/expected/038_optimised_scope.txt new file mode 100644 index 00000000..6f56c049 --- /dev/null +++ b/regression/expected/038_optimised_scope.txt @@ -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. diff --git a/regression/expected/039_storage.txt b/regression/expected/039_storage.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/040_station.txt b/regression/expected/040_station.txt new file mode 100644 index 00000000..e21c7fe4 --- /dev/null +++ b/regression/expected/040_station.txt @@ -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 diff --git a/regression/expected/041_articulated_tram_32bpp.txt b/regression/expected/041_articulated_tram_32bpp.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/042_badges.txt b/regression/expected/042_badges.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/043_name_case.txt b/regression/expected/043_name_case.txt new file mode 100644 index 00000000..5eb69d9c --- /dev/null +++ b/regression/expected/043_name_case.txt @@ -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' diff --git a/regression/expected/example_industry.txt b/regression/expected/example_industry.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/example_object.txt b/regression/expected/example_object.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/example_railtype.txt b/regression/expected/example_railtype.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/example_road_vehicle.txt b/regression/expected/example_road_vehicle.txt new file mode 100644 index 00000000..6a7e0f2a --- /dev/null +++ b/regression/expected/example_road_vehicle.txt @@ -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 diff --git a/regression/expected/example_roadtype_and_tramtype.txt b/regression/expected/example_roadtype_and_tramtype.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression/expected/example_station.txt b/regression/expected/example_station.txt new file mode 100644 index 00000000..9b118fb6 --- /dev/null +++ b/regression/expected/example_station.txt @@ -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 diff --git a/regression/expected/example_train.txt b/regression/expected/example_train.txt new file mode 100644 index 00000000..e69de29b