Changeset 209 in tmcsimulator for branches/FEPSimulator/nbproject/Makefile-Debug.mk

Timestamp:

11/02/2017 12:07:25 AM (9 years ago)

Author:

jtorres

Message:

branches/FEPSimulator/tests: added unit test HighwaysParserTest?.cpp, which yielded a bug in HighwayParser?.cpp (not returning correct loop_loc... garbage data...), this likely explains why not all green dots were showing

File:

• branches/FEPSimulator/nbproject/Makefile-Debug.mk (modified) (2 diffs)

branches/FEPSimulator/nbproject/Makefile-Debug.mk

@@ -43 +43 @@
         ${OBJECTDIR}/fep_xdr.o
 
+# Test Directory
+TESTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tests
+
+# Test Files
+TESTFILES= \
+        ${TESTDIR}/TestFiles/f1
 
 # C Compiler Flags
-CFLAGS=
+CFLAGS=`cppunit-config --cflags` 
 
 # CC Compiler Flags
-CCFLAGS=
-CXXFLAGS=
+CCFLAGS=`cppunit-config --cflags` 
+CXXFLAGS=`cppunit-config --cflags` 
 
 # Fortran Compiler Flags
@@ -62 +68 @@
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-        "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
-
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}
-        ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-        ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator ${OBJECTFILES} ${LDLIBSOPTIONS}
+        "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${TESTDIR}/TestFiles/f2
+
+${TESTDIR}/TestFiles/f2: ${OBJECTFILES}
+        ${MKDIR} -p ${TESTDIR}/TestFiles
+        ${LINK.cc} -o ${TESTDIR}/TestFiles/f2 ${OBJECTFILES} ${LDLIBSOPTIONS}
 
 ${OBJECTDIR}/DataPacker.o: DataPacker.cpp 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp
+        $(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp
 
 ${OBJECTDIR}/FEPSim.o: FEPSim.cpp 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
+        $(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
 
 ${OBJECTDIR}/HighwaysParser.o: HighwaysParser.cpp 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp
+        $(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp
 
 ${OBJECTDIR}/Main.o: Main.cpp 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp
+        $(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp
 
 ${OBJECTDIR}/fep_clnt.o: fep_clnt.c 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.c) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt.o fep_clnt.c
+        $(COMPILE.c) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt.o fep_clnt.c
 
 ${OBJECTDIR}/fep_xdr.o: fep_xdr.c 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.c) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_xdr.o fep_xdr.c
+        $(COMPILE.c) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_xdr.o fep_xdr.c
 
 # Subprojects
 .build-subprojects:
+
+# Build Test Targets
+.build-tests-conf: .build-conf ${TESTFILES}
+${TESTDIR}/TestFiles/f1: ${TESTDIR}/tests/HighwaysParserTest.o ${OBJECTFILES:%.o=%_nomain.o}
+        ${MKDIR} -p ${TESTDIR}/TestFiles
+        ${LINK.cc}   -o ${TESTDIR}/TestFiles/f1 $^ ${LDLIBSOPTIONS} 
+
+
+${TESTDIR}/tests/HighwaysParserTest.o: tests/HighwaysParserTest.cpp 
+        ${MKDIR} -p ${TESTDIR}/tests
+        ${RM} "$@.d"
+        $(COMPILE.cc) -g -I. -I. -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/HighwaysParserTest.o tests/HighwaysParserTest.cpp
+
+
+${OBJECTDIR}/DataPacker_nomain.o: ${OBJECTDIR}/DataPacker.o DataPacker.cpp 
+        ${MKDIR} -p ${OBJECTDIR}
+        @NMOUTPUT=`${NM} ${OBJECTDIR}/DataPacker.o`; \
+        if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
+        then  \
+            ${RM} "$@.d";\
+            $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker_nomain.o DataPacker.cpp;\
+        else  \
+            ${CP} ${OBJECTDIR}/DataPacker.o ${OBJECTDIR}/DataPacker_nomain.o;\
+        fi
+
+${OBJECTDIR}/FEPSim_nomain.o: ${OBJECTDIR}/FEPSim.o FEPSim.cpp 
+        ${MKDIR} -p ${OBJECTDIR}
+        @NMOUTPUT=`${NM} ${OBJECTDIR}/FEPSim.o`; \
+        if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
+        then  \
+            ${RM} "$@.d";\
+            $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim_nomain.o FEPSim.cpp;\
+        else  \
+            ${CP} ${OBJECTDIR}/FEPSim.o ${OBJECTDIR}/FEPSim_nomain.o;\
+        fi
+
+${OBJECTDIR}/HighwaysParser_nomain.o: ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp 
+        ${MKDIR} -p ${OBJECTDIR}
+        @NMOUTPUT=`${NM} ${OBJECTDIR}/HighwaysParser.o`; \
+        if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
+        then  \
+            ${RM} "$@.d";\
+            $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser_nomain.o HighwaysParser.cpp;\
+        else  \
+            ${CP} ${OBJECTDIR}/HighwaysParser.o ${OBJECTDIR}/HighwaysParser_nomain.o;\
+        fi
+
+${OBJECTDIR}/Main_nomain.o: ${OBJECTDIR}/Main.o Main.cpp 
+        ${MKDIR} -p ${OBJECTDIR}
+        @NMOUTPUT=`${NM} ${OBJECTDIR}/Main.o`; \
+        if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
+        then  \
+            ${RM} "$@.d";\
+            $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main_nomain.o Main.cpp;\
+        else  \
+            ${CP} ${OBJECTDIR}/Main.o ${OBJECTDIR}/Main_nomain.o;\
+        fi
+
+${OBJECTDIR}/fep_clnt_nomain.o: ${OBJECTDIR}/fep_clnt.o fep_clnt.c 
+        ${MKDIR} -p ${OBJECTDIR}
+        @NMOUTPUT=`${NM} ${OBJECTDIR}/fep_clnt.o`; \
+        if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
+        then  \
+            ${RM} "$@.d";\
+            $(COMPILE.c) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt_nomain.o fep_clnt.c;\
+        else  \
+            ${CP} ${OBJECTDIR}/fep_clnt.o ${OBJECTDIR}/fep_clnt_nomain.o;\
+        fi
+
+${OBJECTDIR}/fep_xdr_nomain.o: ${OBJECTDIR}/fep_xdr.o fep_xdr.c 
+        ${MKDIR} -p ${OBJECTDIR}
+        @NMOUTPUT=`${NM} ${OBJECTDIR}/fep_xdr.o`; \
+        if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
+           (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
+        then  \
+            ${RM} "$@.d";\
+            $(COMPILE.c) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_xdr_nomain.o fep_xdr.c;\
+        else  \
+            ${CP} ${OBJECTDIR}/fep_xdr.o ${OBJECTDIR}/fep_xdr_nomain.o;\
+        fi
+
+# Run Test Targets
+.test-conf:
+        @if [ "${TEST}" = "" ]; \
+        then  \
+            ${TESTDIR}/TestFiles/f1 || true; \
+        else  \
+            ./${TEST} || true; \
+        fi
 
 # Clean Targets
 .clean-conf: ${CLEAN_SUBPROJECTS}
         ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-        ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
+        ${RM} ${TESTDIR}/TestFiles/f2
 
 # Subprojects