archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test coverage: make LCOV ignore bug() and all calls to BUG()

Browse source 
In theory, these should be unreachable, so they shouldn't be covered
with testing.
This commit is contained in:
Aaron Traas 2017-06-28 12:21:05 -04:00 • committed by Eric S. Raymond
parent 94aca03203
commit 6521d49c07
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
actions.c
View file

@ -1138,7 +1138,7 @@ int action(FILE *input, struct command_t *command)
case PART: case PART:
return reservoir(); return reservoir();
default: default:
BUG(INTRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); BUG(INTRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
} }
} }
/* FALLTHRU */ /* FALLTHRU */
@ -1235,13 +1235,13 @@ int action(FILE *input, struct command_t *command)
case PART: case PART:
return reservoir(); return reservoir();
default: default:
BUG(TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); BUG(TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
} }
case unknown: case unknown:
/* Unknown verb, couldn't deduce object - might need hint */ /* Unknown verb, couldn't deduce object - might need hint */
rspeak(WHAT_DO, command->wd1, command->wd1x); rspeak(WHAT_DO, command->wd1, command->wd1x);
return GO_CHECKHINT; return GO_CHECKHINT;
default: default:
BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE
} }
} }

14
main.c
View file

@ -250,7 +250,7 @@ static void checkhints(void)
game.hintlc[hint] = 0; game.hintlc[hint] = 0;
return; return;
default: default:
BUG(HINT_NUMBER_EXCEEDS_GOTO_LIST); BUG(HINT_NUMBER_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
break; break;
} }
@ -524,7 +524,7 @@ static bool playermove(token_t verb, int motion)
int scratchloc, k2, kk = tkey[game.loc]; int scratchloc, k2, kk = tkey[game.loc];
game.newloc = game.loc; game.newloc = game.loc;
if (kk == 0) if (kk == 0)
BUG(LOCATION_HAS_NO_TRAVEL_ENTRIES); BUG(LOCATION_HAS_NO_TRAVEL_ENTRIES); // LCOV_EXCL_LINE
if (motion == NUL) if (motion == NUL)
return true; return true;
else if (motion == BACK) { else if (motion == BACK) {
@ -640,7 +640,7 @@ static bool playermove(token_t verb, int motion)
break; break;
do { do {
if (travel[kk].stop) if (travel[kk].stop)
BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE
++kk; ++kk;
game.newloc = T_HIGH(travel[kk]); game.newloc = T_HIGH(travel[kk]);
} while } while
@ -681,7 +681,7 @@ static bool playermove(token_t verb, int motion)
drop(EMERALD, game.loc); drop(EMERALD, game.loc);
do { do {
if (travel[kk].stop) if (travel[kk].stop)
BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE
++kk; ++kk;
game.newloc = T_HIGH(travel[kk]); game.newloc = T_HIGH(travel[kk]);
} while } while
@ -723,7 +723,7 @@ static bool playermove(token_t verb, int motion)
return true; return true;
} }
default: default:
BUG(SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST); BUG(SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
} }
} }
break; /* Leave L12 loop */ break; /* Leave L12 loop */
@ -1113,7 +1113,7 @@ Lookup:
rspeak(kmod); rspeak(kmod);
goto L2012; goto L2012;
default: default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
} }
Laction: Laction:
@ -1150,7 +1150,7 @@ Laction:
rspeak(DWARVES_AWAKEN); rspeak(DWARVES_AWAKEN);
terminate(endgame); terminate(endgame);
default: default:
BUG(ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH); BUG(ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH); // LCOV_EXCL_LINE
} }
} }
} }

6
misc.c
View file

@ -411,7 +411,7 @@ long vocab(long id, long init)
lexeme = -1; lexeme = -1;
if (init < 0) if (init < 0)
return (lexeme); return (lexeme);
BUG(REQUIRED_VOCABULARY_WORD_NOT_FOUND); BUG(REQUIRED_VOCABULARY_WORD_NOT_FOUND); // LCOV_EXCL_LINE
} }
if (init >= 0 && KTAB[i] / 1000 != init) if (init >= 0 && KTAB[i] / 1000 != init)
continue; continue;
@ -422,7 +422,7 @@ long vocab(long id, long init)
return (lexeme); return (lexeme);
} }
} }
BUG(RAN_OFF_END_OF_VOCABULARY_TABLE); BUG(RAN_OFF_END_OF_VOCABULARY_TABLE); // LCOV_EXCL_LINE
} }
void juggle(long object) void juggle(long object)
@ -690,10 +690,12 @@ void datime(long* d, long* t)
*t = (long) tv.tv_usec; *t = (long) tv.tv_usec;
} }
// LCOV_EXCL_START
void bug(enum bugtype num, const char *error_string) void bug(enum bugtype num, const char *error_string)
{ {
fprintf(stderr, "Fatal error %d, %s.\n", num, error_string); fprintf(stderr, "Fatal error %d, %s.\n", num, error_string);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// LCOV_EXCL_STOP
/* end */ /* end */