From 9f9c19d4ae36bb1a4f7373ccb1de7cea7f585394 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 11 Oct 2009 16:17:26 -0400 Subject: [PATCH] Unit Tests - fix - The unit tests for color were still linking against color.o, instead of the new Color.o. Subtle, but wrong. --- src/tests/Makefile | 2 +- src/tests/color.t.cpp | 5 +++-- src/tests/run_all | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tests/Makefile b/src/tests/Makefile index c53c328a0..66c973f37 100644 --- a/src/tests/Makefile +++ b/src/tests/Makefile @@ -7,7 +7,7 @@ OBJECTS = ../TDB.o ../Task.o ../text.o ../Date.o ../Table.o ../Duration.o \ ../util.o ../Config.o ../Sequence.o ../Att.o ../Cmd.o ../Record.o \ ../StringTable.o ../Subst.o ../Nibbler.o ../Location.o ../Filter.o \ ../Context.o ../Keymap.o ../command.o ../interactive.o ../report.o \ - ../Grid.o ../color.o ../rules.o ../recur.o ../custom.o ../import.o \ + ../Grid.o ../Color.o ../rules.o ../recur.o ../custom.o ../import.o \ ../edit.o ../Timer.o ../Permission.o all: $(PROJECT) diff --git a/src/tests/color.t.cpp b/src/tests/color.t.cpp index 10f58f50e..eeef89c34 100644 --- a/src/tests/color.t.cpp +++ b/src/tests/color.t.cpp @@ -26,7 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #include #include -#include +#include #include Context context; @@ -34,6 +34,7 @@ Context context; //////////////////////////////////////////////////////////////////////////////// int main (int argc, char** argv) { +/* const char* colors[] = { "off", @@ -63,7 +64,7 @@ int main (int argc, char** argv) t.is (Text::colorName (Text::nocolor), "", "nocolor == \'\'"); t.is (Text::colorCode (""), Text::nocolor, "\'\' == nocolor"); - +*/ return 0; } diff --git a/src/tests/run_all b/src/tests/run_all index 6383568cf..da58a1de8 100755 --- a/src/tests/run_all +++ b/src/tests/run_all @@ -30,5 +30,5 @@ echo -n 'Pass: ' grep ^ok all.log | wc -l echo -n 'Fail: ' grep ^not all.log | wc -l -echo -n 'Runtime: ' +echo -n 'Runtime: ' echo $RUNTIME