tests: Define SIMPLECPP_TEST_SOURCE_DIR for Makefile build

This updates the Makefile so that `test.o` is compiled with
`-DSIMPLECPP_TEST_SOURCE_DIR="$(CURDIR)"`, ensuring the test suite
can locate headers and sources consistently with the CMake build.

Author: jcfr

Makefile

@@ -3,10 +3,15 @@ all:	testrunner simplecpp
 CXXFLAGS = -Wall -Wextra -pedantic -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls -Wundef -Wno-multichar -Wold-style-cast -std=c++11 -g $(CXXOPTS)
 LDFLAGS = -g $(LDOPTS)
 
+# Define test source dir macro for compilation
+TEST_DEFINES = -DSIMPLECPP_TEST_SOURCE_DIR=\"$(CURDIR)\"
+
+# Only test.o gets the define
+test.o: CXXFLAGS += $(TEST_DEFINES)
+
 %.o: %.cpp	simplecpp.h
 	$(CXX) $(CXXFLAGS) -c $<
 
-
 testrunner:	test.o	simplecpp.o
 	$(CXX) $(LDFLAGS) simplecpp.o test.o -o testrunner
 

test.cpp

@@ -16,6 +16,10 @@
 #include <utility>
 #include <vector>
 
+#ifndef SIMPLECPP_TEST_SOURCE_DIR
+#error "SIMPLECPP_TEST_SOURCE_DIR is not defined."
+#endif
+
 #define STRINGIZE_(x) #x
 #define STRINGIZE(x) STRINGIZE_(x)
 
@@ -1556,9 +1560,7 @@ static void has_include_1()
                         "  #endif\n"
                         "#endif";
     simplecpp::DUI dui;
-#ifdef SIMPLECPP_TEST_SOURCE_DIR
     dui.includePaths.push_back(SIMPLECPP_TEST_SOURCE_DIR);
-#endif
     dui.std = "c++17";
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
     dui.std = "c++14";
@@ -1576,9 +1578,7 @@ static void has_include_2()
                         "  #endif\n"
                         "#endif";
     simplecpp::DUI dui;
-#ifdef SIMPLECPP_TEST_SOURCE_DIR
     dui.includePaths.push_back(SIMPLECPP_TEST_SOURCE_DIR);
-#endif
     dui.std = "c++17";
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
     ASSERT_EQUALS("", preprocess(code));
@@ -1598,11 +1598,7 @@ static void has_include_3()
     // Test file not found...
     ASSERT_EQUALS("\n\n\n\nB", preprocess(code, dui));
     // Unless -I is set (preferably, we should differentiate -I and -isystem...)
-#ifdef SIMPLECPP_TEST_SOURCE_DIR
     dui.includePaths.push_back(std::string(SIMPLECPP_TEST_SOURCE_DIR) + "/testsuite");
-#else
-    dui.includePaths.push_back("./testsuite");
-#endif
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
     ASSERT_EQUALS("", preprocess(code));
 }
@@ -1618,9 +1614,7 @@ static void has_include_4()
                         "#endif";
     simplecpp::DUI dui;
     dui.std = "c++17";
-#ifdef SIMPLECPP_TEST_SOURCE_DIR
     dui.includePaths.push_back(SIMPLECPP_TEST_SOURCE_DIR);
-#endif
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
     ASSERT_EQUALS("", preprocess(code));
 }
@@ -1636,9 +1630,7 @@ static void has_include_5()
                         "#endif";
     simplecpp::DUI dui;
     dui.std = "c++17";
-#ifdef SIMPLECPP_TEST_SOURCE_DIR
     dui.includePaths.push_back(SIMPLECPP_TEST_SOURCE_DIR);
-#endif
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
     ASSERT_EQUALS("", preprocess(code));
 }
@@ -1654,9 +1646,7 @@ static void has_include_6()
                         "#endif";
     simplecpp::DUI dui;
     dui.std = "gnu99";
-#ifdef SIMPLECPP_TEST_SOURCE_DIR
     dui.includePaths.push_back(SIMPLECPP_TEST_SOURCE_DIR);
-#endif
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
     ASSERT_EQUALS("", preprocess(code));
 }