No magic, revert some experimental changes in pipeline
This commit is contained in:
parent
a680514d5f
commit
30822d0ba4
2 changed files with 9 additions and 15 deletions
|
@ -19,7 +19,6 @@ binary:debug:
|
||||||
- "*.o"
|
- "*.o"
|
||||||
- dungeon.c
|
- dungeon.c
|
||||||
- dungeon.h
|
- dungeon.h
|
||||||
- "*.gcno"
|
|
||||||
|
|
||||||
binary:release:
|
binary:release:
|
||||||
stage: build
|
stage: build
|
||||||
|
@ -72,16 +71,12 @@ test:debug:
|
||||||
before_script:
|
before_script:
|
||||||
- zypper install -y make gcc libedit-devel libasan3 libubsan0 python python2-PyYAML lcov
|
- zypper install -y make gcc libedit-devel libasan3 libubsan0 python python2-PyYAML lcov
|
||||||
script:
|
script:
|
||||||
- make debug
|
- make coverage
|
||||||
- make check
|
|
||||||
- lcov -t "advent" -o advent.info -c -d .
|
|
||||||
- genhtml -o coverage advent.info
|
|
||||||
- cd tests
|
|
||||||
- ./coverage_dungeon.py
|
|
||||||
- cd ..
|
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- coverage
|
- coverage
|
||||||
|
dependencies:
|
||||||
|
- binary:debug
|
||||||
|
|
||||||
test:release:
|
test:release:
|
||||||
stage: test
|
stage: test
|
||||||
|
|
13
main.c
13
main.c
|
@ -137,7 +137,7 @@ static bool fallback_handler(struct command_t command)
|
||||||
/* fallback handler for commands not handled by FORTRANish parser */
|
/* fallback handler for commands not handled by FORTRANish parser */
|
||||||
{
|
{
|
||||||
long sv;
|
long sv;
|
||||||
char buf[2 * LINESIZE + 1];
|
char buf[DIM(command.raw1) + DIM(command.raw2) + 1];
|
||||||
sprintf(buf, "%s %s", command.raw1, command.raw2);
|
sprintf(buf, "%s %s", command.raw1, command.raw2);
|
||||||
|
|
||||||
if (sscanf(buf, "seed %ld", &sv) == 1) {
|
if (sscanf(buf, "seed %ld", &sv) == 1) {
|
||||||
|
@ -146,8 +146,7 @@ static bool fallback_handler(struct command_t command)
|
||||||
// autogenerated, so don't charge user time for it.
|
// autogenerated, so don't charge user time for it.
|
||||||
--game.turns;
|
--game.turns;
|
||||||
return true;
|
return true;
|
||||||
}
|
} else if (sscanf(buf, "waste %ld", &sv) == 1) {
|
||||||
else if (sscanf(buf, "waste %ld", &sv) == 1) {
|
|
||||||
game.limit -= sv;
|
game.limit -= sv;
|
||||||
printf("Game limit is now %ld\n", game.limit);
|
printf("Game limit is now %ld\n", game.limit);
|
||||||
return true;
|
return true;
|
||||||
|
@ -909,10 +908,10 @@ static void lampcheck(void)
|
||||||
rspeak(REPLACE_BATTERIES);
|
rspeak(REPLACE_BATTERIES);
|
||||||
game.prop[BATTERY] = DEAD_BATTERIES;
|
game.prop[BATTERY] = DEAD_BATTERIES;
|
||||||
#ifdef __unused__
|
#ifdef __unused__
|
||||||
/* This code from the original game seems to have been faulty.
|
/* This code from the original game seems to have been faulty.
|
||||||
* No tests ever passed the guard, and with the guard removed
|
* No tests ever passed the guard, and with the guard removed
|
||||||
* the game hangs when the lamp limit is reached.
|
* the game hangs when the lamp limit is reached.
|
||||||
*/
|
*/
|
||||||
if (TOTING(BATTERY))
|
if (TOTING(BATTERY))
|
||||||
drop(BATTERY, game.loc);
|
drop(BATTERY, game.loc);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue