Som 2023 11 01 (#20)

* pipeline tests * pipeline tests * pipeline tests * pipeline tests
sorgom · Nov 1, 2023 · 4a11820 · 4a11820
1 parent a8a768a
commit 4a11820
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/BuildCppUTest b/BuildCppUTest
diff --git a/make/coverage_app.make b/make/coverage_app.make
@@ -22,12 +22,12 @@ RESCOMP = windres
 TARGETDIR = lib
 TARGET = $(TARGETDIR)/libcoverage_app.a
 OBJDIR = obj/coverage_app
-DEFINES += -DDEBUG
+DEFINES += -DDEBUG -DCPPUTEST_USE_LONG_LONG=0
 INCLUDES += -I../testing/testenv -I../specification -I../application -I../application/modules -I../devel -I../BuildCppUTest/include
 FORCE_INCLUDE +=
 ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -pedantic-errors -fprofile-arcs -ftest-coverage
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -pedantic-errors -fprofile-arcs -ftest-coverage
+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -std=c++98 -pedantic-errors -fprofile-arcs -ftest-coverage
+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -std=c++98 -pedantic-errors -fprofile-arcs -ftest-coverage
 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
 LIBS +=
 LDDEPS +=

diff --git a/make/coverage_tests.make b/make/coverage_tests.make
@@ -26,8 +26,8 @@ DEFINES += -DDEBUG
 INCLUDES += -I../testing/testenv -I../specification -I../application -I../application/modules -I../devel -I../BuildCppUTest/include
 FORCE_INCLUDE +=
 ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -pedantic-errors
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -pedantic-errors
+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -std=c++98 -pedantic-errors
+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -std=c++98 -pedantic-errors
 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
 LIBS += lib/libcoverage_app.a -lCppUTest -lCppUTestExt -lgcov
 LDDEPS += lib/libcoverage_app.a

diff --git a/make/premake5.lua b/make/premake5.lua
@@ -21,7 +21,7 @@ workspace 'tests'
         '../BuildCppUTest/include'
     }
 
-    buildoptions { '-pedantic-errors' }
+    buildoptions { '-std=c++98 -pedantic-errors' }
 
     project 'tests'
         kind        'ConsoleApp'
@@ -33,7 +33,7 @@ workspace 'tests'
             '../testing/tests/**.cpp'
         }
 
-        defines { 'NDEBUG' }
+        defines { 'NDEBUG', 'CPPUTEST_USE_LONG_LONG=0' }
         optimize 'On'
         libdirs { '../BuildCppUTest/lib' }
         links { 'CppUTest', 'CppUTestExt' }
@@ -58,7 +58,7 @@ workspace 'coverage'
         '../BuildCppUTest/include'
     }
 
-    buildoptions { '-pedantic-errors' }
+    buildoptions { '-std=c++98 -pedantic-errors' }
 
     project 'coverage_app'
         kind        'StaticLib'
@@ -68,7 +68,7 @@ workspace 'coverage'
             '../application/modules/**.cpp',
         }
 
-        defines { 'DEBUG' }
+        defines { 'DEBUG', 'CPPUTEST_USE_LONG_LONG=0' }
         symbols 'On'
         buildoptions {'-fprofile-arcs -ftest-coverage'}
 

diff --git a/make/tests.make b/make/tests.make
@@ -22,12 +22,12 @@ RESCOMP = windres
 TARGETDIR = bin
 TARGET = $(TARGETDIR)/tests
 OBJDIR = obj/tests
-DEFINES += -DNDEBUG
+DEFINES += -DNDEBUG -DCPPUTEST_USE_LONG_LONG=0
 INCLUDES += -I../testing/testenv -I../specification -I../application -I../application/modules -I../devel -I../BuildCppUTest/include
 FORCE_INCLUDE +=
 ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O2 -pedantic-errors
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O2 -pedantic-errors
+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O2 -std=c++98 -pedantic-errors
+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O2 -std=c++98 -pedantic-errors
 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
 LIBS += -lCppUTest -lCppUTestExt
 LDDEPS +=