diff --git a/.gitignore b/.gitignore index ddb549b..7aa1928 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause advent *.gcda *.gcno diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d0ab9d..6b6bd6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause stages: - ci-build - build diff --git a/.shipper b/.shipper index a34d7d6..4127e0c 100644 --- a/.shipper +++ b/.shipper @@ -1,3 +1,7 @@ +<-- +SPDX-FileCopyrightText: Eric S. Raymond +SPDX-License-Identifier: BSD-2-Clause +--> extralines="""

There is a code coverage analysis and a symbol coverage analysis

""" diff --git a/COPYING b/COPYING index c4da3e1..b1de571 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,4 @@ - BSD LICENSE - -Copyright (c) 1977, 2005 by Will Crowther and Don Woods -Copyright (c) 2017 by Eric S. Raymond + BSD 2-Clause LICENSE Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/Dockerfile.ci b/Dockerfile.ci index 535ed65..8a2c8bb 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,5 +1,7 @@ # This image is built by the Gitlab CI pipeline to be used in subsequent # pipeline steps. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause FROM ubuntu diff --git a/Makefile b/Makefile index 0f82c4a..d6ceb82 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ # Makefile for the open-source release of adventure 2.5 +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause + # To build with save/resume disabled, pass CFLAGS="-DADVENT_NOSAVE" # To build with auto-save/resume enabled, pass CFLAGS="-DADVENT_AUTOSAVE" diff --git a/actions.c b/actions.c index 27364b7..05377ff 100644 --- a/actions.c +++ b/actions.c @@ -1,9 +1,9 @@ /* * Actions for the dungeon-running code. * - * Copyright (c) 1977, 2005 by Will Crowther and Don Woods - * Copyright (c) 2017 by Eric S. Raymond - * SPDX-License-Identifier: BSD-2-clause + * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods + * SPDX-FileCopyrightText 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/advent.desktop b/advent.desktop index d41c896..bb049de 100644 --- a/advent.desktop +++ b/advent.desktop @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause [Desktop Entry] Type=Application Name=Open Adventure diff --git a/advent.h b/advent.h index 8a31a9c..100de43 100644 --- a/advent.h +++ b/advent.h @@ -1,3 +1,10 @@ +/* + * Dungeon types and macros. + * + * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods + * SPDX-FileCopyrightText: 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-Clause + */ #include #include #include diff --git a/advent.svg b/advent.svg index 8f50e5e..02a0e1b 100644 --- a/advent.svg +++ b/advent.svg @@ -2,30 +2,8 @@ diff --git a/adventure.yaml b/adventure.yaml index 8dfd1c8..791d8ac 100644 --- a/adventure.yaml +++ b/adventure.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause +# # This YAML file gets processed into a collection of data structures and # variable initializers describing Colossal Cave. It replaces an ad-hoc # text database shipped with Adventure versions up to 2.5. The format @@ -115,8 +118,6 @@ # %S = the letter 's' or nothing (if a previous %d value is exactly 1) # %V = substitute program version string # -# Copyright (c) 2017 by Eric S. Raymond -# SPDX-License-Identifier: BSD-2-clause # Motion names of the form MOT_* are not explicitly referenced in the # locations YAML, but usually get compiled into generated C. diff --git a/cheat.c b/cheat.c index df9ab5b..ebbc166 100644 --- a/cheat.c +++ b/cheat.c @@ -4,9 +4,9 @@ * savefile(), so we know we're always outputting save files that advent * can import. * - * Copyright (c) 1977, 2005 by Will Crowther and Don Woods - * Copyright (c) 2017 by Eric S. Raymond - * SPDX-License-Identifier: BSD-2-clause + * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods + * SPDX-FileCopyrightText: 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/init.c b/init.c index b890fba..dbdfb11 100644 --- a/init.c +++ b/init.c @@ -1,9 +1,9 @@ /* * Initialisation * - * Copyright (c) 1977, 2005 by Will Crowther and Don Woods - * Copyright (c) 2017 by Eric S. Raymond - * SPDX-License-Identifier: BSD-2-clause + * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods + * SPDX-FileCopyrightText: 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/main.c b/main.c index d4539b1..acbabb6 100644 --- a/main.c +++ b/main.c @@ -1,7 +1,7 @@ /* - * Copyright (c) 1977, 2005 by Will Crowther and Don Woods - * Copyright (c) 2017 by Eric S. Raymond - * SPDX-License-Identifier: BSD-2-clause + * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods + * SPDX-FileCopyrightText: 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/make_dungeon.py b/make_dungeon.py index c7c9b75..0d224d3 100755 --- a/make_dungeon.py +++ b/make_dungeon.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause """ This is the open-adventure dungeon generator. It consumes a YAML description of the dungeon and outputs a dungeon.h and dungeon.c pair of C code files. @@ -6,9 +8,6 @@ the dungeon and outputs a dungeon.h and dungeon.c pair of C code files. The nontrivial part of this is the compilation of the YAML for movement rules to the travel array that's actually used by playermove(). - -Copyright (c) 2017 by Eric S. Raymond -SPDX-License-Identifier: BSD-2-clause """ # pylint: disable=consider-using-f-string,line-too-long,invalid-name,missing-function-docstring,too-many-branches,global-statement,multiple-imports,too-many-locals,too-many-statements,too-many-nested-blocks,no-else-return,raise-missing-from,redefined-outer-name @@ -21,7 +20,7 @@ C_NAME = "dungeon.c" H_TEMPLATE_PATH = "templates/dungeon.h.tpl" C_TEMPLATE_PATH = "templates/dungeon.c.tpl" -DONOTEDIT_COMMENT = "/* Generated from adventure.yaml - do not hand-hack! */\n/* SPDX-License-Identifier: BSD-2-clause */\n\n" +DONOTEDIT_COMMENT = "/* Generated from adventure.yaml - do not hand-hack! */\n\n" statedefines = "" diff --git a/make_graph.py b/make_graph.py index 62ac68b..edaaa6f 100755 --- a/make_graph.py +++ b/make_graph.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause """\ usage: make-graph.py [-a] -d] [-m] [-s] @@ -11,8 +13,6 @@ Make a DOT graph of Colossal Cave. -s = emit graph of non-forest surface locations -v = include internal symbols in room labels """ -# Copyright (c) 2017 by Eric S. Raymond -# SPDX-License-Identifier: BSD-2-clause # pylint: disable=consider-using-f-string,line-too-long,invalid-name,missing-function-docstring,multiple-imports,redefined-outer-name diff --git a/misc.c b/misc.c index c2512cb..9a8d2e5 100644 --- a/misc.c +++ b/misc.c @@ -1,9 +1,9 @@ /* * I/O and support routines. * - * Copyright (c) 1977, 2005 by Will Crowther and Don Woods - * Copyright (c) 2017 by Eric S. Raymond - * SPDX-License-Identifier: BSD-2-clause + * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods + * SPDX-FileCopyrightText: 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/saveresume.c b/saveresume.c index dedb5bb..db1153b 100644 --- a/saveresume.c +++ b/saveresume.c @@ -4,9 +4,9 @@ * (ESR) This replaces a bunch of particularly nasty FORTRAN-derived code; * see the history.adoc file in the source distribution for discussion. * - * Copyright (c) 1977, 2005 by Will Crowther and Don Woods - * Copyright (c) 2017 by Eric S. Raymond - * SPDX-License-Identifier: BSD-2-clause + * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods + * SPDX-FileCopyrightText: 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/score.c b/score.c index 24dcc0a..8e37374 100644 --- a/score.c +++ b/score.c @@ -1,9 +1,9 @@ /* * Scoring and wrap-up. * - * Copyright (c) 1977, 2005 by Will Crowther and Don Woods - * Copyright (c) 2017 by Eric S. Raymond - * SPDX-License-Identifier: BSD-2-clause + * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods + * SPDX-FileCopyrightText: 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-Clause */ #include #include "advent.h" diff --git a/templates/coverage_dungeon.html.tpl b/templates/coverage_dungeon.html.tpl index 372c43f..9545ca2 100644 --- a/templates/coverage_dungeon.html.tpl +++ b/templates/coverage_dungeon.html.tpl @@ -1,3 +1,7 @@ +<-- +SPDX-FileCopyrightText: Eric S. Raymond +SPDX-License-Identifier: BSD-2-Clause +--> diff --git a/templates/dungeon.c.tpl b/templates/dungeon.c.tpl index dbc28a6..25f4d26 100644 --- a/templates/dungeon.c.tpl +++ b/templates/dungeon.c.tpl @@ -1,3 +1,8 @@ +/* +SPDX-FileCopyrightText: Eric S. Raymond +SPDX-License-Identifier: BSD-2-Clause +*/ + #include "{h_file}" const char* arbitrary_messages[] = {{ @@ -48,4 +53,4 @@ const travelop_t travel[] = {{ const char *ignore = "{ignore}"; -/* end */ \ No newline at end of file +/* end */ diff --git a/templates/dungeon.h.tpl b/templates/dungeon.h.tpl index e42ab07..8abb529 100644 --- a/templates/dungeon.h.tpl +++ b/templates/dungeon.h.tpl @@ -1,3 +1,7 @@ +/* +SPDX-FileCopyrightText: Eric S. Raymond +SPDX-License-Identifier: BSD-2-Clause +*/ #ifndef DUNGEON_H #define DUNGEON_H diff --git a/tests/Makefile b/tests/Makefile index 2f547a0..a95f464 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,8 @@ # Test-suite makefile for open-adventure +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause + # Use absolute path so tests that change working directory still use # scripts from parent directory. Note that using $PWD seems to fail # here under Gitlab's CI environment. diff --git a/tests/axebear.log b/tests/axebear.log index 8498b21..c27ad64 100644 --- a/tests/axebear.log +++ b/tests/axebear.log @@ -1,4 +1,6 @@ ## Observe axe after throwing at bear +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/axeorama.log b/tests/axeorama.log index 7d2e273..a3b050c 100644 --- a/tests/axeorama.log +++ b/tests/axeorama.log @@ -1,4 +1,6 @@ ## Test throwing axe at non-dwarves. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Added coverage of LOC_DEADCRAWL and CROSS_BRIDGE n seed 1838473132 diff --git a/tests/barehands.log b/tests/barehands.log index 233c325..47559a0 100644 --- a/tests/barehands.log +++ b/tests/barehands.log @@ -1,4 +1,6 @@ ## Get to dragon, refuse to use bare hands +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Fails due uninteresting difference in whitespace process. # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 n diff --git a/tests/bigfail.log b/tests/bigfail.log index 121cd09..e4543b6 100644 --- a/tests/bigfail.log +++ b/tests/bigfail.log @@ -1,4 +1,6 @@ ## Test many nonlethal failure conditions +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # See comments in this log n seed 1838473132 diff --git a/tests/birdsnakewake.log b/tests/birdsnakewake.log index 0d64d15..81e3080 100644 --- a/tests/birdsnakewake.log +++ b/tests/birdsnakewake.log @@ -1,4 +1,6 @@ ## Attempt to kill snake with bird in the endgame +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/birdweight.log b/tests/birdweight.log index 80cc3a6..8b56bb4 100644 --- a/tests/birdweight.log +++ b/tests/birdweight.log @@ -1,4 +1,6 @@ ## Verify that the bird is weightless in inventory +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Checks fix for GitLab issue #40 #NOCOMPARE Bird was not weightless in cage in advent430 so this test is invalid. n diff --git a/tests/boulder2.log b/tests/boulder2.log index b52c757..d2dc120 100644 --- a/tests/boulder2.log +++ b/tests/boulder2.log @@ -1,4 +1,6 @@ ## Coverage of LOC_BOULDERS2.short +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/breakmirror.log b/tests/breakmirror.log index d93b075..8254c97 100644 --- a/tests/breakmirror.log +++ b/tests/breakmirror.log @@ -1,4 +1,6 @@ ## Break the mirror in endgame and die +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/carrybird.log b/tests/carrybird.log index d57736c..42ab656 100644 --- a/tests/carrybird.log +++ b/tests/carrybird.log @@ -1,4 +1,6 @@ ## Try to carry bird without cage, then kill bird +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1071883378 in diff --git a/tests/carryfreebird.log b/tests/carryfreebird.log index 0c81742..aa80f69 100644 --- a/tests/carryfreebird.log +++ b/tests/carryfreebird.log @@ -1,4 +1,6 @@ ## Try to carry the bird after freeing it instead of listening +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1495951709 attack diff --git a/tests/cheatresume.log b/tests/cheatresume.log index 96c442a..eaa110b 100644 --- a/tests/cheatresume.log +++ b/tests/cheatresume.log @@ -1,4 +1,6 @@ ## Resume from absurd save file with numdie = -900 +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Can't compare to advent430 due to version skew n resume diff --git a/tests/cheatresume2.log b/tests/cheatresume2.log index f317d82..f9a69f4 100644 --- a/tests/cheatresume2.log +++ b/tests/cheatresume2.log @@ -1,4 +1,6 @@ ## Resume from absurd save file with numdie = -1000 +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # generating "off my scale" score threshold message #NOCOMPARE Can't compare to advent430 due to version skew n diff --git a/tests/coverage_dungeon.py b/tests/coverage_dungeon.py index c583ffb..9d01c84 100755 --- a/tests/coverage_dungeon.py +++ b/tests/coverage_dungeon.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause """ This is the open-adventure dungeon text coverage report generator. It consumes a YAML description of the dungeon and determines whether the diff --git a/tests/death-jump.log b/tests/death-jump.log index 3c877f0..f37b80f 100644 --- a/tests/death-jump.log +++ b/tests/death-jump.log @@ -1,4 +1,6 @@ ## Jump into a pit and die, refuse reincarnation +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1495774850 in diff --git a/tests/defeat.log b/tests/defeat.log index c42430a..a09858c 100644 --- a/tests/defeat.log +++ b/tests/defeat.log @@ -1,4 +1,6 @@ ## Last-minute defeat, with lava. Also tests vase drop before pillow. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 n seed 1838473132 diff --git a/tests/domefail.log b/tests/domefail.log index df46939..984d659 100644 --- a/tests/domefail.log +++ b/tests/domefail.log @@ -1,4 +1,6 @@ ## Take nugget and fail to climb to the dome +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/dragon_secret5.log b/tests/dragon_secret5.log index 15f3668..1c5213f 100644 --- a/tests/dragon_secret5.log +++ b/tests/dragon_secret5.log @@ -1,4 +1,6 @@ ## Check that dead dragon actually moves its location (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 18084731 in diff --git a/tests/dropcagedbird.log b/tests/dropcagedbird.log index c7adca1..299e6b0 100644 --- a/tests/dropcagedbird.log +++ b/tests/dropcagedbird.log @@ -1,4 +1,6 @@ ## Try to carry the bird after freeing it instead of listening +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1495951709 in diff --git a/tests/drown.log b/tests/drown.log index b5ebf27..4089b60 100644 --- a/tests/drown.log +++ b/tests/drown.log @@ -1,4 +1,6 @@ ## Speak a magic word at an inopportune time and drown. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 n seed 1838473132 diff --git a/tests/dwarf.log b/tests/dwarf.log index 3bb0d4b..38054e8 100644 --- a/tests/dwarf.log +++ b/tests/dwarf.log @@ -1,4 +1,6 @@ ## In which the dwarf kills you +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1494912171 in diff --git a/tests/dwarf_alternative.log b/tests/dwarf_alternative.log index 590cb59..28d9f93 100644 --- a/tests/dwarf_alternative.log +++ b/tests/dwarf_alternative.log @@ -1,4 +1,6 @@ ## Check that dwarf spawns in alternative location (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 383847 in diff --git a/tests/eggs_done.log b/tests/eggs_done.log index 2384789..4aef5b5 100644 --- a/tests/eggs_done.log +++ b/tests/eggs_done.log @@ -1,4 +1,6 @@ ## Be done with Giant Room and eggs (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/eggs_vanish.log b/tests/eggs_vanish.log index b14fb72..97ba790 100644 --- a/tests/eggs_vanish.log +++ b/tests/eggs_vanish.log @@ -1,4 +1,6 @@ ## Vanishing eggs in Giant Room (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/endgame428.log b/tests/endgame428.log index 8df0238..04130d5 100644 --- a/tests/endgame428.log +++ b/tests/endgame428.log @@ -1,4 +1,6 @@ ## 428-point walkthrough +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 n seed 1838473132 diff --git a/tests/endobjects.log b/tests/endobjects.log index 96e9fd8..63d98a8 100644 --- a/tests/endobjects.log +++ b/tests/endobjects.log @@ -1,4 +1,6 @@ ### Check that water is unavailable in endgame +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Addresses GitLab issue #55: in endgame, some object starting states are incorrect #NOCOMPARE Bird was not weightless in cage in advent430, this test depends on that. no diff --git a/tests/fail_hint_maze.log b/tests/fail_hint_maze.log index d458561..ce429fe 100644 --- a/tests/fail_hint_maze.log +++ b/tests/fail_hint_maze.log @@ -1,4 +1,6 @@ ## Fail to get maze hint by being empty-handed (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 25508795 in diff --git a/tests/fail_hint_ogre.log b/tests/fail_hint_ogre.log index f75fd79..9623c1e 100644 --- a/tests/fail_hint_ogre.log +++ b/tests/fail_hint_ogre.log @@ -1,4 +1,6 @@ ## Qualify for ogre hint but fail due to dwarves dead (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Fails due uninteresting difference in whitespace process. n seed 1838473132 diff --git a/tests/fail_hint_ogre2.log b/tests/fail_hint_ogre2.log index 4961479..89c294a 100644 --- a/tests/fail_hint_ogre2.log +++ b/tests/fail_hint_ogre2.log @@ -1,4 +1,6 @@ ## Qualify for ogre hint but fail due to nearby dwarf (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 25508795 in diff --git a/tests/fail_hint_woods.log b/tests/fail_hint_woods.log index 3df72f4..455c715 100644 --- a/tests/fail_hint_woods.log +++ b/tests/fail_hint_woods.log @@ -1,4 +1,6 @@ ## Fail getting wood hint by finding appendage (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n n z diff --git a/tests/fillfail.log b/tests/fillfail.log index afb125f..503992b 100644 --- a/tests/fillfail.log +++ b/tests/fillfail.log @@ -1,4 +1,6 @@ ## Attempt to fill lamp, attempt to fill bottle with no source +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n in carry lamp diff --git a/tests/fillvase.log b/tests/fillvase.log index 8414f14..babbf9f 100644 --- a/tests/fillvase.log +++ b/tests/fillvase.log @@ -1,4 +1,6 @@ ## Fill the vase +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Arthur O'Dwyer writes: # # (4) Lastly, here's a test case for you! Go get the VASE; then get the diff --git a/tests/flyback.log b/tests/flyback.log index d0db54b..e661942 100644 --- a/tests/flyback.log +++ b/tests/flyback.log @@ -1,4 +1,6 @@ ## Test fix for issue 51: rug flying is broken +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Behavior differs due to a bug fix. n seed 1838473132 diff --git a/tests/footslip.log b/tests/footslip.log index ad02244..398027a 100644 --- a/tests/footslip.log +++ b/tests/footslip.log @@ -1,4 +1,6 @@ ## Coverage of LOC_FOOTSLIP +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/gemstates.log b/tests/gemstates.log index ea49416..9daaa6b 100644 --- a/tests/gemstates.log +++ b/tests/gemstates.log @@ -1,4 +1,6 @@ ## Observe amber, ruby, sapphire after state change +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1635997320 in diff --git a/tests/goback.log b/tests/goback.log index 490ed7a..ea6c87c 100644 --- a/tests/goback.log +++ b/tests/goback.log @@ -1,4 +1,6 @@ ## Test many nonlethal failure conditions +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # This variant elicits the prompt to go back for batteries # See comments in this log #NOCOMPARE Relies on "waste" diff --git a/tests/hint_dark.log b/tests/hint_dark.log index ddc9bc9..456f33c 100644 --- a/tests/hint_dark.log +++ b/tests/hint_dark.log @@ -1,4 +1,6 @@ ## Elicit hint for dealing with plugh room and darkness (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1495951709 in diff --git a/tests/hint_grate.log b/tests/hint_grate.log index e7ddd73..f13b03f 100644 --- a/tests/hint_grate.log +++ b/tests/hint_grate.log @@ -1,4 +1,6 @@ ## Elicit hint for dealing with grate +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1495774850 in diff --git a/tests/hint_jade.log b/tests/hint_jade.log index 58a44fe..9fdac24 100644 --- a/tests/hint_jade.log +++ b/tests/hint_jade.log @@ -1,4 +1,6 @@ ## Elicit hint for getting the jade (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/hint_snake.log b/tests/hint_snake.log index 9ffc302..169b2b5 100644 --- a/tests/hint_snake.log +++ b/tests/hint_snake.log @@ -1,4 +1,6 @@ ## Elicit hint for dealing with snake +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1951269982 in diff --git a/tests/hint_urn.log b/tests/hint_urn.log index 926bc7d..ed5a8aa 100644 --- a/tests/hint_urn.log +++ b/tests/hint_urn.log @@ -1,4 +1,6 @@ ## Elicit hint for dealing with urn (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Policy decision - no point in emulating advent430's extra \n here n seed 1495951709 diff --git a/tests/hint_witt.log b/tests/hint_witt.log index 6127dd5..c657f16 100644 --- a/tests/hint_witt.log +++ b/tests/hint_witt.log @@ -1,4 +1,6 @@ ## Hint for Witt's End +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Policy decision - no point in emulating advent430's extra \n here n seed 1635997320 diff --git a/tests/illformed.log b/tests/illformed.log index db4d1a5..3e5d6a2 100644 --- a/tests/illformed.log +++ b/tests/illformed.log @@ -1,4 +1,6 @@ ## Test for various cases not found in walkthroughs. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE This is busted under advent430 -- see comments within. foo diff --git a/tests/illformed2.log b/tests/illformed2.log index 99c9c80..4685861 100644 --- a/tests/illformed2.log +++ b/tests/illformed2.log @@ -1,4 +1,6 @@ ## Test for various cases not found in walkthroughs (advent430-compatible). +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Commented-out lines cause troble in advent430 n seed 1635997320 diff --git a/tests/intransitivecarry.log b/tests/intransitivecarry.log index 640a296..ee81196 100644 --- a/tests/intransitivecarry.log +++ b/tests/intransitivecarry.log @@ -1,4 +1,6 @@ ## Carry when only one object is present +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n in carry lamp diff --git a/tests/issue36.log b/tests/issue36.log index cab1d04..8176d4d 100644 --- a/tests/issue36.log +++ b/tests/issue36.log @@ -1,4 +1,6 @@ ## Test handling of object after transitive verb. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 826186526 in diff --git a/tests/issue37.log b/tests/issue37.log index ded6a10..b9caafe 100644 --- a/tests/issue37.log +++ b/tests/issue37.log @@ -1,4 +1,6 @@ ## Test handling of transitive verb after noun +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n in food diff --git a/tests/lampdim.log b/tests/lampdim.log index fe4fc4e..54d95d9 100644 --- a/tests/lampdim.log +++ b/tests/lampdim.log @@ -1,4 +1,6 @@ ## Test the case where your lamp goes dim +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/lampdim2.log b/tests/lampdim2.log index 14a615e..6771c36 100644 --- a/tests/lampdim2.log +++ b/tests/lampdim2.log @@ -1,4 +1,6 @@ ## Try (and fail) to carry message at vending machine +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/lampdim3.log b/tests/lampdim3.log index 18f7e47..37282e5 100644 --- a/tests/lampdim3.log +++ b/tests/lampdim3.log @@ -1,4 +1,6 @@ ## Die while closing +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/listen.log b/tests/listen.log index 135fdbc..e58c687 100644 --- a/tests/listen.log +++ b/tests/listen.log @@ -1,4 +1,6 @@ ## Check that listen command hears all objects as well as location sound +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause no seed 1181530211 e diff --git a/tests/listenloud.log b/tests/listenloud.log index 3e820e4..81dfcf3 100644 --- a/tests/listenloud.log +++ b/tests/listenloud.log @@ -1,4 +1,6 @@ ## Attempt to listen at a loud location +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 n seed 1495951709 @@ -139,4 +141,4 @@ u reservoir Q'IBJ n -listen \ No newline at end of file +listen diff --git a/tests/lockchain.log b/tests/lockchain.log index bf9cd99..9d2c0e2 100644 --- a/tests/lockchain.log +++ b/tests/lockchain.log @@ -1,4 +1,6 @@ ## Test multiple re-locking and unlocking of bear's chain +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 n seed 1635997320 diff --git a/tests/logopt.log b/tests/logopt.log index 5074144..74ba48a 100644 --- a/tests/logopt.log +++ b/tests/logopt.log @@ -1,4 +1,6 @@ ## Exercise logging option and seed dump +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #options: -l scratch.tmp n in diff --git a/tests/magicwords.log b/tests/magicwords.log index 4b86370..f99a66b 100644 --- a/tests/magicwords.log +++ b/tests/magicwords.log @@ -1,4 +1,6 @@ ## Test processing of variuus fee fie foe foo fum cases. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # # How thry're supposed to work: # diff --git a/tests/mazealldiff.log b/tests/mazealldiff.log index d129c13..a13a372 100644 --- a/tests/mazealldiff.log +++ b/tests/mazealldiff.log @@ -1,4 +1,6 @@ ## Coverage of all LOC_DIFFERENT* +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/mazehint.log b/tests/mazehint.log index 454b4f9..cf7ef02 100644 --- a/tests/mazehint.log +++ b/tests/mazehint.log @@ -1,4 +1,6 @@ ## Elicit the maze hint. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1071883378 in diff --git a/tests/multifile.chk b/tests/multifile.chk index ab4b57d..3e845b3 100644 --- a/tests/multifile.chk +++ b/tests/multifile.chk @@ -2,6 +2,8 @@ Welcome to Adventure!! Would you like instructions? > ## Test handling of object after transitive verb. +> # SPDX-FileCopyrightText: Eric S. Raymond +> # SPDX-License-Identifier: BSD-2-Clause > n > n diff --git a/tests/notrident.log b/tests/notrident.log index e51a325..fecef2a 100644 --- a/tests/notrident.log +++ b/tests/notrident.log @@ -1,4 +1,6 @@ ## Try to open clam without trident and fail +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1635997320 in diff --git a/tests/ogre_no_dwarves.log b/tests/ogre_no_dwarves.log index fe51b51..62f6576 100644 --- a/tests/ogre_no_dwarves.log +++ b/tests/ogre_no_dwarves.log @@ -1,4 +1,6 @@ ## Try to attack ogre with no dwarves present (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 25508795 in diff --git a/tests/ogrehint.log b/tests/ogrehint.log index 12a9d02..18b8977 100644 --- a/tests/ogrehint.log +++ b/tests/ogrehint.log @@ -1,4 +1,6 @@ ## Elicit the ogre hint. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 437547289 seed 1071883378 diff --git a/tests/oilplant.log b/tests/oilplant.log index 35eab35..b29408b 100644 --- a/tests/oilplant.log +++ b/tests/oilplant.log @@ -1,4 +1,6 @@ ## Attempt to oil the beanstalk after watering it +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/oldstyle.log b/tests/oldstyle.log index 4711df0..f82e847 100644 --- a/tests/oldstyle.log +++ b/tests/oldstyle.log @@ -1,4 +1,6 @@ ## Simple quit +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #options: -o #NOCOMPARE Comment not interpreted by advent430 n diff --git a/tests/outcheck.sh b/tests/outcheck.sh index e46979f..c88b8ba 100755 --- a/tests/outcheck.sh +++ b/tests/outcheck.sh @@ -1,4 +1,6 @@ #! /bin/sh +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause case $? in 0) echo "ok - $1 succeeded";; *) echo "not ok - $1 failed";; diff --git a/tests/oysterbug.log b/tests/oysterbug.log index 0310c97..c7392d5 100644 --- a/tests/oysterbug.log +++ b/tests/oysterbug.log @@ -1,4 +1,6 @@ # Demonstrate fix of buggy response to unlocking oyster while carrying it. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE This fails due to a known bug in advent430 n seed 1838473132 diff --git a/tests/panic.log b/tests/panic.log index de6f2c5..b2701be 100644 --- a/tests/panic.log +++ b/tests/panic.log @@ -1,4 +1,6 @@ ## Panic test - attempt to unlock grate after game closed. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/panic2.log b/tests/panic2.log index f95aa5b..53324a6 100644 --- a/tests/panic2.log +++ b/tests/panic2.log @@ -1,4 +1,6 @@ ## Panic test - attempt to xyzzy out after game is closed. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/pirate_carry.log b/tests/pirate_carry.log index 0ba55c4..c4feadb 100644 --- a/tests/pirate_carry.log +++ b/tests/pirate_carry.log @@ -1,4 +1,6 @@ ## Check that pirate steals loose treasure from ground (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1837473132 in diff --git a/tests/pirate_pyramid.log b/tests/pirate_pyramid.log index 1d16702..1c3a858 100644 --- a/tests/pirate_pyramid.log +++ b/tests/pirate_pyramid.log @@ -1,4 +1,6 @@ ## Pirate mustn't take pyramid from plover/dark rooms (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1830473132 in diff --git a/tests/pirate_spotted.log b/tests/pirate_spotted.log index 0c6512a..3b6269a 100644 --- a/tests/pirate_spotted.log +++ b/tests/pirate_spotted.log @@ -1,4 +1,6 @@ ## Spot pirate to manifest chest before last treasure (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/pitfall.log b/tests/pitfall.log index 6532713..85dec35 100644 --- a/tests/pitfall.log +++ b/tests/pitfall.log @@ -1,4 +1,6 @@ ## Death by pitfall +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Die 3 times so we can cover all the obituary messages n seed 780351908 diff --git a/tests/plover.log b/tests/plover.log index 740ed16..cdba74c 100644 --- a/tests/plover.log +++ b/tests/plover.log @@ -1,4 +1,6 @@ ## Test access to emerald room and plover teleport +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 n seed 1495951709 diff --git a/tests/reach_ledge_short.log b/tests/reach_ledge_short.log index a0acfc6..2952898 100644 --- a/tests/reach_ledge_short.log +++ b/tests/reach_ledge_short.log @@ -1,4 +1,6 @@ ## LOC_NOCLIMB.short (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/reach_noclimb.log b/tests/reach_noclimb.log index 59768ea..e32e28d 100644 --- a/tests/reach_noclimb.log +++ b/tests/reach_noclimb.log @@ -1,4 +1,6 @@ ## LOC_NOCLIMB (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/reach_planttop.log b/tests/reach_planttop.log index 730ea1b..6614da1 100644 --- a/tests/reach_planttop.log +++ b/tests/reach_planttop.log @@ -1,4 +1,6 @@ ## LOC_PLANTTOP (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/reincarnate.log b/tests/reincarnate.log index 39be5dd..1b76b44 100644 --- a/tests/reincarnate.log +++ b/tests/reincarnate.log @@ -1,4 +1,6 @@ ## Jump into a pit and die, then be reincarnated +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1495774850 in diff --git a/tests/resumefail.log b/tests/resumefail.log index e7944ef..7f661da 100644 --- a/tests/resumefail.log +++ b/tests/resumefail.log @@ -1,4 +1,6 @@ ## Resume from invalid filename +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE advent430 crashes on resume from invalid filename and we don't care. n seed 1240742801 diff --git a/tests/resumefail2.log b/tests/resumefail2.log index 7aaac36..fa4e063 100644 --- a/tests/resumefail2.log +++ b/tests/resumefail2.log @@ -1,4 +1,6 @@ ## Resume from from generated save with version mismatch error +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Reveals a bug in advent430 handling of saves with invalid versions. n resume diff --git a/tests/savefail.log b/tests/savefail.log index c598d19..c9f489e 100644 --- a/tests/savefail.log +++ b/tests/savefail.log @@ -1,4 +1,6 @@ ## Save right after starting to invalid filename +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE advent430 crashes on save to invalid filename and we don't care. n seed 1240742801 diff --git a/tests/saveresume.1.log b/tests/saveresume.1.log index 45945ce..bf97407 100644 --- a/tests/saveresume.1.log +++ b/tests/saveresume.1.log @@ -1,4 +1,6 @@ ## Save right after starting +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Can't compare to advent430 due to version skew n seed 1240742801 diff --git a/tests/saveresume.2.log b/tests/saveresume.2.log index 71db28c..d995289 100644 --- a/tests/saveresume.2.log +++ b/tests/saveresume.2.log @@ -1,4 +1,6 @@ ## Resume and then quit +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Can't compare to advent430 due to version skew n in diff --git a/tests/saveresume.3.log b/tests/saveresume.3.log index fd7be6f..29ea76b 100644 --- a/tests/saveresume.3.log +++ b/tests/saveresume.3.log @@ -1,4 +1,6 @@ ## Almost win, then save +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 #NOCOMPARE Seems to reveal a bug in advent430's save function. n diff --git a/tests/saveresume.4.log b/tests/saveresume.4.log index 883d098..c419410 100644 --- a/tests/saveresume.4.log +++ b/tests/saveresume.4.log @@ -1,4 +1,6 @@ ## Resume, then win +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Here to get class threshold of 426 # Note, savefile name has trailing space #NOCOMPARE Reveals that advent430 does not resume in endgame gracefully. diff --git a/tests/saveresumeopt.log b/tests/saveresumeopt.log index f5256c2..f776e68 100644 --- a/tests/saveresumeopt.log +++ b/tests/saveresumeopt.log @@ -1,3 +1,5 @@ ## Simple quit +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE New feature, -r option #options: -r saveresume.adv diff --git a/tests/savetamper.log b/tests/savetamper.log index 0396e99..31146c1 100644 --- a/tests/savetamper.log +++ b/tests/savetamper.log @@ -1,4 +1,6 @@ ## Resume from artificial "corrupted" save +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Can't compare to advent430 due to version skew n resume diff --git a/tests/snake_food.log b/tests/snake_food.log index 4950277..015f0eb 100644 --- a/tests/snake_food.log +++ b/tests/snake_food.log @@ -1,4 +1,6 @@ ## Snake must vocally eat bird +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1951269982 in diff --git a/tests/softroom.log b/tests/softroom.log index b6b60e7..125f2a3 100644 --- a/tests/softroom.log +++ b/tests/softroom.log @@ -1,4 +1,6 @@ ## Drop vase in soft room after pillow removed +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Verify that the vase does not break n seed 1838473132 diff --git a/tests/specials.log b/tests/specials.log index 4784faf..3cf9c5c 100644 --- a/tests/specials.log +++ b/tests/specials.log @@ -1,4 +1,6 @@ ## Test special words +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE The news text has changed n thank diff --git a/tests/splatter.log b/tests/splatter.log index 2408bcd..8c718d9 100644 --- a/tests/splatter.log +++ b/tests/splatter.log @@ -1,4 +1,6 @@ ## Adventurer fall down go boom. Also tests 'say' verb on magic words. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 n seed 1838473132 diff --git a/tests/takebird.log b/tests/takebird.log index b2f5f70..279d9e9 100644 --- a/tests/takebird.log +++ b/tests/takebird.log @@ -1,4 +1,6 @@ ## Verify that bird starts caged in endgame +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause no seed 1318612053 e diff --git a/tests/tall.log b/tests/tall.log index eaebfad..1ca79c8 100644 --- a/tests/tall.log +++ b/tests/tall.log @@ -1,4 +1,6 @@ ## Coverage of LOC_TALL, LOC_WIDEPLACE, LOC_TIGHTPLACE +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/tapdiffer b/tests/tapdiffer index f48bcc3..98df500 100755 --- a/tests/tapdiffer +++ b/tests/tapdiffer @@ -1,4 +1,6 @@ #! /bin/sh +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # # tapdiffer - Render diff between input and checkfile as a TAP report # diff --git a/tests/tapview b/tests/tapview index ca984eb..ee3ec50 100755 --- a/tests/tapview +++ b/tests/tapview @@ -1,14 +1,13 @@ #! /bin/sh # tapview - a TAP (Test Anything Protocol) viewer in pure POSIX shell # -# Copyright by Eric S. Raymond -# # This code is intended to be embedded in your project. The author # grants permission for it to be distributed under the prevailing # license of your project if you choose, provided that license is # OSD-compliant; otherwise the following SPDX tag incorporates a # license by reference. # +# SPDX-FileCopyrightText: Eric S. Raymond # SPDX-License-Identifier: BSD-2-Clause # # This is version 1.6 diff --git a/tests/trident.log b/tests/trident.log index 871834a..f3c5073 100644 --- a/tests/trident.log +++ b/tests/trident.log @@ -1,4 +1,6 @@ ## 161-point run to pirate appearance and death by dwarf +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 n seed 1071883378 diff --git a/tests/troll_returns.log b/tests/troll_returns.log index 2697faf..c8d9a25 100644 --- a/tests/troll_returns.log +++ b/tests/troll_returns.log @@ -1,4 +1,6 @@ ## See that troll returns if we stole his eggs before crossing +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/turnpenalties.log b/tests/turnpenalties.log index 2cd3c9e..04c87e5 100644 --- a/tests/turnpenalties.log +++ b/tests/turnpenalties.log @@ -1,4 +1,6 @@ ## check that the turn count penalties occur +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1951269982 in diff --git a/tests/urntest.log b/tests/urntest.log index a02d663..97b8ee1 100644 --- a/tests/urntest.log +++ b/tests/urntest.log @@ -1,4 +1,6 @@ ## Test verbs on urn +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/urntest2.log b/tests/urntest2.log index e0c3a6b..87daa80 100644 --- a/tests/urntest2.log +++ b/tests/urntest2.log @@ -1,4 +1,6 @@ ## Test filling urn when you have no bottle +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Also, try to lock door after oiling it n seed 1838473132 diff --git a/tests/urntest3.log b/tests/urntest3.log index a835588..a095fa5 100644 --- a/tests/urntest3.log +++ b/tests/urntest3.log @@ -1,4 +1,6 @@ ## Test filling urn twice. Also, try to lock door after oiling it. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/vending.log b/tests/vending.log index 883a3c7..c78b276 100644 --- a/tests/vending.log +++ b/tests/vending.log @@ -1,4 +1,6 @@ ## Get batteries from the vending machine +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1635997320 in diff --git a/tests/wakedwarves.log b/tests/wakedwarves.log index d733fb9..63dfe50 100644 --- a/tests/wakedwarves.log +++ b/tests/wakedwarves.log @@ -1,4 +1,6 @@ ## Wake the dwarves and die. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/wakedwarves2.log b/tests/wakedwarves2.log index adf737e..4d8986b 100644 --- a/tests/wakedwarves2.log +++ b/tests/wakedwarves2.log @@ -1,4 +1,6 @@ ## Wake the dwarves by waving rod and die. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/wakedwarves3.log b/tests/wakedwarves3.log index e04669b..c21a71e 100644 --- a/tests/wakedwarves3.log +++ b/tests/wakedwarves3.log @@ -1,4 +1,6 @@ ## Wake the dwarves by attacking one and die. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1838473132 in diff --git a/tests/water_plant2.log b/tests/water_plant2.log index 4f39d8f..6c53d30 100644 --- a/tests/water_plant2.log +++ b/tests/water_plant2.log @@ -1,4 +1,6 @@ ## Check that pour correctly switches among plant states (fuzzed) +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Behavior differs due to a parser bug fix. n seed 183847312 diff --git a/tests/weirdbird.log b/tests/weirdbird.log index 37f4a36..b6c1457 100644 --- a/tests/weirdbird.log +++ b/tests/weirdbird.log @@ -1,4 +1,6 @@ ## Do pointless things to the bird to test odd cases. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 694608006 in diff --git a/tests/weirddwarf.log b/tests/weirddwarf.log index b7af3a0..7d22d1e 100644 --- a/tests/weirddwarf.log +++ b/tests/weirddwarf.log @@ -1,4 +1,6 @@ ## Exercise various verbs on a dwarf +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause n seed 1071883378 in diff --git a/tests/win430.log b/tests/win430.log index c989c53..efcbd76 100644 --- a/tests/win430.log +++ b/tests/win430.log @@ -1,4 +1,6 @@ ## Ryan Sarson's 430-point win. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause no seed 1318612053 e diff --git a/tests/wittsend.log b/tests/wittsend.log index 580f7c8..5657f35 100644 --- a/tests/wittsend.log +++ b/tests/wittsend.log @@ -1,4 +1,6 @@ ## 342-point run to Witt's End and plover room. +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 n seed 1635997320 diff --git a/tests/woodshint.log b/tests/woodshint.log index 6052028..fadef1a 100644 --- a/tests/woodshint.log +++ b/tests/woodshint.log @@ -1,4 +1,6 @@ ## Test hinting logic - elicit forest hint +# SPDX-FileCopyrightText: Eric S. Raymond +# SPDX-License-Identifier: BSD-2-Clause #NOCOMPARE Behavior differs due to a parser bug fix. # Also some tests of intransitive-verb cases n