Add quotation to all windows paths to handle spaces

Signed-off-by: hoangtungdinh <11166240+hoangtungdinh@users.noreply.github.com>
asam-ev · Oct 2, 2024 · 457752f · 457752f
1 parent 9bfb8ed
commit 457752f
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 38 deletions.
diff --git a/.github/workflows/windows-manifest/framework.json b/.github/workflows/windows-manifest/framework.json
@@ -2,8 +2,8 @@
     "manifest_file_path": [
         "$ASAM_QC_FRAMEWORK_MANIFEST_DIR\\osc.json",
         "${ASAM_QC_FRAMEWORK_MANIFEST_DIR}\\odr.json",
-        "%ASAM_QC_FRAMEWORK_MANIFEST_DIR%\\otx.json",
+        "\"%ASAM_QC_FRAMEWORK_MANIFEST_DIR%\"\\otx.json",
         "D:\\a\\qc-framework\\qc-framework\\.github\\workflows\\windows-manifest\\result_pooling.json",
         "D:\\a\\qc-framework\\qc-framework\\.github\\workflows\\windows-manifest\\text_report.json"
     ]
-}
+}
diff --git a/.github/workflows/windows-manifest/odr.json b/.github/workflows/windows-manifest/odr.json
@@ -4,7 +4,7 @@
       "name": "xodrBundle",
       "exec_type": "executable",
       "module_type": "checker_bundle",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && qc_opendrive -c %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && qc_opendrive -c \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
-}
+}
diff --git a/.github/workflows/windows-manifest/osc.json b/.github/workflows/windows-manifest/osc.json
@@ -4,7 +4,7 @@
       "name": "xoscBundle",
       "exec_type": "executable",
       "module_type": "checker_bundle",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && qc_openscenario -c %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && qc_openscenario -c \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
-}
+}
diff --git a/.github/workflows/windows-manifest/otx.json b/.github/workflows/windows-manifest/otx.json
@@ -4,7 +4,7 @@
       "name": "otxBundle",
       "exec_type": "executable",
       "module_type": "checker_bundle",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && qc_otx -c %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && qc_otx -c \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
-}
+}
diff --git a/.github/workflows/windows-manifest/result_pooling.json b/.github/workflows/windows-manifest/result_pooling.json
@@ -4,7 +4,7 @@
       "name": "ResultPooling",
       "exec_type": "executable",
       "module_type": "result_pooling",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && %ASAM_QC_FRAMEWORK_INSTALLATION_DIR%\\ResultPooling.exe %ASAM_QC_FRAMEWORK_WORKING_DIR% %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && %ASAM_QC_FRAMEWORK_INSTALLATION_DIR%\\ResultPooling.exe \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
-}
+}
diff --git a/.github/workflows/windows-manifest/text_report.json b/.github/workflows/windows-manifest/text_report.json
@@ -4,7 +4,7 @@
       "name": "TextReport",
       "exec_type": "executable",
       "module_type": "report_module",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && %ASAM_QC_FRAMEWORK_INSTALLATION_DIR%\\TextReport.exe %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && %ASAM_QC_FRAMEWORK_INSTALLATION_DIR%\\TextReport.exe \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
-}
+}
diff --git a/manifest_examples/windows/qc_opendrive.json b/manifest_examples/windows/qc_opendrive.json
@@ -4,7 +4,7 @@
       "name": "xodrBundle",
       "exec_type": "executable",
       "module_type": "checker_bundle",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && qc_opendrive -c %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && qc_opendrive -c \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
 }
diff --git a/manifest_examples/windows/qc_openscenarioxml.json b/manifest_examples/windows/qc_openscenarioxml.json
@@ -4,7 +4,7 @@
       "name": "xoscBundle",
       "exec_type": "executable",
       "module_type": "checker_bundle",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && qc_openscenario -c %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && qc_openscenario -c \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
 }
diff --git a/manifest_examples/windows/qc_otx.json b/manifest_examples/windows/qc_otx.json
@@ -4,7 +4,7 @@
       "name": "otxBundle",
       "exec_type": "executable",
       "module_type": "checker_bundle",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && qc_otx -c %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && qc_otx -c \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
 }
diff --git a/manifest_examples/windows/report_gui.json b/manifest_examples/windows/report_gui.json
@@ -4,7 +4,7 @@
       "name": "ReportGUI",
       "exec_type": "executable",
       "module_type": "report_module",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && C:\\Users\\asam\\QC-Framework-Out\\bin\\ReportGUI.exe %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && C:\\Users\\asam\\QC-Framework-Out\\bin\\ReportGUI.exe \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
 }
diff --git a/manifest_examples/windows/result_pooling.json b/manifest_examples/windows/result_pooling.json
@@ -4,7 +4,7 @@
       "name": "ResultPooling",
       "exec_type": "executable",
       "module_type": "result_pooling",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && C:\\Users\\asam\\QC-Framework-Out\\bin\\ResultPooling.exe %ASAM_QC_FRAMEWORK_WORKING_DIR% %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && C:\\Users\\asam\\QC-Framework-Out\\bin\\ResultPooling.exe \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
 }
diff --git a/manifest_examples/windows/text_report.json b/manifest_examples/windows/text_report.json
@@ -4,7 +4,7 @@
       "name": "TextReport",
       "exec_type": "executable",
       "module_type": "report_module",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && C:\\Users\\asam\\QC-Framework-Out\\bin\\TextReport.exe %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && C:\\Users\\asam\\QC-Framework-Out\\bin\\TextReport.exe \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
 }
diff --git a/runtime/tests/test_data/windows/demo_checker_bundle_manifest.json b/runtime/tests/test_data/windows/demo_checker_bundle_manifest.json
@@ -4,7 +4,7 @@
       "name": "DemoCheckerBundle",
       "exec_type": "executable",
       "module_type": "checker_bundle",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && ..\\..\\bin\\DemoCheckerBundle.exe %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && ..\\..\\bin\\DemoCheckerBundle.exe \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
-}
+}
diff --git a/runtime/tests/test_data/windows/result_pooling_manifest.json b/runtime/tests/test_data/windows/result_pooling_manifest.json
@@ -1,10 +1,10 @@
 {
-    "module": [
-      {
-        "name": "ResultPooling",
-        "exec_type": "executable",
-        "module_type": "result_pooling",
-        "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && ..\\..\\bin\\ResultPooling.exe %ASAM_QC_FRAMEWORK_WORKING_DIR% %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
-      }
-    ]
-  }
+  "module": [
+    {
+      "name": "ResultPooling",
+      "exec_type": "executable",
+      "module_type": "result_pooling",
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && ..\\..\\bin\\ResultPooling.exe \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
+    }
+  ]
+}
diff --git a/runtime/tests/test_data/windows/text_report_manifest.json b/runtime/tests/test_data/windows/text_report_manifest.json
@@ -1,10 +1,10 @@
 {
-    "module": [
-      {
-        "name": "TextReport",
-        "exec_type": "executable",
-        "module_type": "report_module",
-        "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && ..\\..\\bin\\TextReport.exe %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
-      }
-    ]
-  }
+  "module": [
+    {
+      "name": "TextReport",
+      "exec_type": "executable",
+      "module_type": "report_module",
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && ..\\..\\bin\\TextReport.exe \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
+    }
+  ]
+}