Coverage fixups.

diff --git a/Makefile b/Makefile
index 80ac01f3b4a10c506305cf3ac9c1b72280281553..c44cce5a8591c0a081e021e876b8e75a89160052 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,8 @@ cheat: $(CHEAT_OBJS) dungeon.o
 check: advent cheat
        cd tests; $(MAKE) --quiet
 
+# After this, run your browser ob coverage/open-adventure/index.html
+# to see coverage results.
 coverage: debug
        cd tests; $(MAKE) coverage --quiet
 

diff --git a/main.c b/main.c
index 61a82e2f49e13e2140b97e167e70b6aeac31475b..dca022a5d9657a044e58a2b0b1ad0354ce230d61 100644 (file)
--- a/main.c
+++ b/main.c
@@ -160,14 +160,14 @@ char *myreadline(const char *prompt)
            if (settings.scriptfp != NULL && feof(settings.scriptfp))
                fclose(settings.scriptfp);
            if (strcmp(next, "-") == 0)
-               settings.scriptfp = stdin;
+               settings.scriptfp = stdin; // LCOV_EXCL_LINE
            else
                settings.scriptfp = fopen(next, "r");
        }
 
        if (isatty(fileno(settings.scriptfp))) {
-           free(buf);
-           return readline(prompt);
+           free(buf); // LCOV_EXCL_LINE
+           return readline(prompt); // LCOV_EXCL_LINE
        } else {
            char *ln = fgets(buf, BUFSIZ-1, settings.scriptfp);
            if (ln != NULL) {
@@ -255,6 +255,7 @@ static void checkhints(void)
                     game.hintlc[hint] = 0;
                     return;
                 default: // LCOV_EXCL_LINE
+                   // Should never hap[pen
                     BUG(HINT_NUMBER_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
                 }