From 457752f22a627d76be6ce4aeb979e37a0740851c Mon Sep 17 00:00:00 2001 From: hoangtungdinh <11166240+hoangtungdinh@users.noreply.github.com> Date: Wed, 2 Oct 2024 12:22:07 +0200 Subject: [PATCH] Add quotation to all windows paths to handle spaces Signed-off-by: hoangtungdinh <11166240+hoangtungdinh@users.noreply.github.com> --- .../workflows/windows-manifest/framework.json | 4 ++-- .github/workflows/windows-manifest/odr.json | 4 ++-- .github/workflows/windows-manifest/osc.json | 4 ++-- .github/workflows/windows-manifest/otx.json | 4 ++-- .../windows-manifest/result_pooling.json | 4 ++-- .../windows-manifest/text_report.json | 4 ++-- manifest_examples/windows/qc_opendrive.json | 2 +- .../windows/qc_openscenarioxml.json | 2 +- manifest_examples/windows/qc_otx.json | 2 +- manifest_examples/windows/report_gui.json | 2 +- manifest_examples/windows/result_pooling.json | 2 +- manifest_examples/windows/text_report.json | 2 +- .../windows/demo_checker_bundle_manifest.json | 4 ++-- .../windows/result_pooling_manifest.json | 18 +++++++++--------- .../windows/text_report_manifest.json | 18 +++++++++--------- 15 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/windows-manifest/framework.json b/.github/workflows/windows-manifest/framework.json index 721cc919..6fb68ecc 100644 --- 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" ] -} +} \ No newline at end of file diff --git a/.github/workflows/windows-manifest/odr.json b/.github/workflows/windows-manifest/odr.json index beecc623..541cab0b 100644 --- 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%\"" } ] -} +} \ No newline at end of file diff --git a/.github/workflows/windows-manifest/osc.json b/.github/workflows/windows-manifest/osc.json index 76f51a00..5a3f42b3 100644 --- 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%\"" } ] -} +} \ No newline at end of file diff --git a/.github/workflows/windows-manifest/otx.json b/.github/workflows/windows-manifest/otx.json index 25f93158..1334de4c 100644 --- 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%\"" } ] -} +} \ No newline at end of file diff --git a/.github/workflows/windows-manifest/result_pooling.json b/.github/workflows/windows-manifest/result_pooling.json index c641b0d6..8c3adef4 100644 --- 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%\"" } ] -} +} \ No newline at end of file diff --git a/.github/workflows/windows-manifest/text_report.json b/.github/workflows/windows-manifest/text_report.json index 2a36e710..66371b73 100644 --- 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%\"" } ] -} +} \ No newline at end of file diff --git a/manifest_examples/windows/qc_opendrive.json b/manifest_examples/windows/qc_opendrive.json index e42c0dae..541cab0b 100755 --- 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%\"" } ] } \ No newline at end of file diff --git a/manifest_examples/windows/qc_openscenarioxml.json b/manifest_examples/windows/qc_openscenarioxml.json index cb23d439..5a3f42b3 100755 --- 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%\"" } ] } \ No newline at end of file diff --git a/manifest_examples/windows/qc_otx.json b/manifest_examples/windows/qc_otx.json index 12d96a84..1334de4c 100755 --- 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%\"" } ] } \ No newline at end of file diff --git a/manifest_examples/windows/report_gui.json b/manifest_examples/windows/report_gui.json index 851fc32b..15cec2e6 100755 --- 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%\"" } ] } \ No newline at end of file diff --git a/manifest_examples/windows/result_pooling.json b/manifest_examples/windows/result_pooling.json index 8230d0a8..8a826379 100755 --- 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%\"" } ] } \ No newline at end of file diff --git a/manifest_examples/windows/text_report.json b/manifest_examples/windows/text_report.json index 43222084..2620ae17 100755 --- 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%\"" } ] } \ No newline at end of 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 index 2f476462..d93376b9 100644 --- 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%\"" } ] -} +} \ No newline at end of file diff --git a/runtime/tests/test_data/windows/result_pooling_manifest.json b/runtime/tests/test_data/windows/result_pooling_manifest.json index 6ef2fc7e..ccc7a12b 100644 --- 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%\"" + } + ] +} \ No newline at end of file diff --git a/runtime/tests/test_data/windows/text_report_manifest.json b/runtime/tests/test_data/windows/text_report_manifest.json index ca2be181..1b39ba54 100644 --- 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%\"" + } + ] +} \ No newline at end of file