Build and dev system improvements (pocoproject#4193)

* fix shellcheck warnings; add some ci ignore test entries * fix(make): Redirect build stderr to a file pocoproject#4112 * enh(dev): add vscode run script and launch items for tests
XinyuKhan · Oct 18, 2023 · 701c8da · 701c8da
1 parent 8a268d4
commit 701c8da
Show file tree

Hide file tree

Showing 23 changed files with 391 additions and 56 deletions.
diff --git a/.gitignore b/.gitignore
@@ -144,6 +144,7 @@ cmake-build/
 *.bak
 stage/
 releases/
+poco_build_stderr.out
 
 # vim #
 #######

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,261 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+  {
+    "name": "Linux GDB Foundation Test",
+    "variables": {
+      "libName": "Foundation"
+    },
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/${libName}/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "environment": [ { "name": "PATH", "value": "${env:PATH}:${workspaceFolder}/${libName}/testsuite/bin/${env:OSNAME}/${env:OSARCH}" } ],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB XML Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/XML/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB JSON Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/JSON/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB Util Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/Util/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB Net Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/Net/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB Crypto Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/Crypto/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB Net SSL Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/NetSSL_OpenSSL/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB Data Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/Data/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB Data/SQLite Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/Data/SQLite/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB Data/ODBC Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/Data/ODBC/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB Data/MySQL Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/Data/MySQL/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB Data/PostgreSQL Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/Data/PostgreSQL/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB MongoDB Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/MongoDB/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  },
+  {
+    "name": "Linux GDB Redis Test",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "${workspaceFolder}/Redis/testsuite/bin/${env:OSNAME}/${env:OSARCH}/testrunnerd",
+    "args": ["-all"],
+    "stopAtEntry": false,
+    "cwd": "${workspaceFolder}",
+    "externalConsole": false,
+    "MIMode": "gdb",
+    "setupCommands": [
+      {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+      }
+      ]
+  }
+  ]
+}
diff --git a/build/config/Linux b/build/config/Linux
@@ -11,6 +11,9 @@
 LINKMODE ?= SHARED
 
 SANITIZEFLAGS ?=
+#-fsanitize=address
+#-fsanitize=undefined
+#-fsanitize=thread
 
 #
 # Define Tools

diff --git a/build/rules/compile b/build/rules/compile
@@ -41,69 +41,69 @@ $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_SHARED) $(OB
 
 $(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(debug, static)"
-	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(release, static)"
-	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(debug, static)"
-	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@
+	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(release, static)"
-	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@
+	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(debug, shared)"
-	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(release, shared)"
-	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(debug, shared)"
-	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(release, shared)"
-	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 # Generated sources
 
 $(OBJPATH_DEBUG_STATIC)/%.o: $(GENDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(debug, static)"
-	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_RELEASE_STATIC)/%.o: $(GENDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(release, static)"
-	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_DEBUG_STATIC)/%.o: $(GENDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(debug, static)"
-	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@
+	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_RELEASE_STATIC)/%.o: $(GENDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(release, static)"
-	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@
+	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_DEBUG_SHARED)/%.o: $(GENDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(debug, shared)"
-	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_RELEASE_SHARED)/%.o: $(GENDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(release, shared)"
-	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_DEBUG_SHARED)/%.o: $(GENDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(debug, shared)"
-	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 $(OBJPATH_RELEASE_SHARED)/%.o: $(GENDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(release, shared)"
-	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@ $(POCO_BUILD_STDERR)
 
 
 #

diff --git a/build/rules/dylib b/build/rules/dylib
@@ -42,6 +42,7 @@ include $(POCO_BASE)/build/rules/compile
 # Rules for creating a dynamically loadable shared library
 #
 clean:
+	$(RM) $(POCO_BUILD_STDERR_FILE)
 	$(RM) $(OBJPATH)
 	$(RM) $(DYLIB_DEBUG) $(DYLIB_RELEASE) $(DYLIB_S_DEBUG) $(DYLIB_S_RELEASE)
 

diff --git a/build/rules/exec b/build/rules/exec
@@ -29,6 +29,7 @@ include $(POCO_BASE)/build/rules/compile
 # Rules for creating an executable
 #
 clean:
+	$(RM) $(POCO_BUILD_STDERR_FILE)
 	$(RM) $(OBJPATH)
 	$(RM) $(EXEC_RELEASE_STATIC) $(EXEC_DEBUG_STATIC) $(EXEC_RELEASE_SHARED) $(EXEC_DEBUG_SHARED)
-Original file line number
+Diff line change
@@ Expand Up / @@ -144,6 +144,7 @@ cmake-build/ @@
     *.bak
     stage/
     releases/
+    poco_build_stderr.out
     # vim #
     #######
@@ Expand Down @@