diff options
Diffstat (limited to 'compiler_wrapper/testdata/cros_nonhardened_golden')
15 files changed, 1482 insertions, 1549 deletions
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json index 96fd88cf..8c25b715 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json @@ -1,22 +1,8 @@ [ { - "wd": "/tmp/stable", - "env": [ - "BISECT_STAGE=someBisectStage", - "HOME=/user/home" - ], - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", - "args": [ - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "/usr/bin/env", "args": [ "python3", "-c", @@ -28,27 +14,26 @@ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -59,30 +44,29 @@ "CCACHE_UMASK=002", "CCACHE_CPP2=yes", "PYTHONPATH=/somepath/test_binary" - ] + ], + "path": "/usr/bin/env" } } - ] - }, - { - "wd": "/tmp/stable", + ], "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir", "HOME=/user/home" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/env", "args": [ "python3", "-c", @@ -94,27 +78,26 @@ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -125,33 +108,30 @@ "CCACHE_UMASK=002", "CCACHE_CPP2=yes", "PYTHONPATH=/somepath/test_binary" - ] + ], + "path": "/usr/bin/env" } } - ] - }, - { - "wd": "/tmp/stable", + ], "env": [ "BISECT_STAGE=someBisectStage", "BISECT_DIR=someBisectDir", "HOME=/user/home" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] - }, - "stdout": "somemessage", - "stderr": "someerror", - "exitcode": 1 - }, + ], + "path": "./x86_64-cros-linux-gnu-clang" + } + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/env", "args": [ "python3", "-c", @@ -163,27 +143,26 @@ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -194,12 +173,30 @@ "CCACHE_UMASK=002", "CCACHE_CPP2=yes", "PYTHONPATH=/somepath/test_binary" - ] + ], + "path": "/usr/bin/env" }, - "stdout": "somemessage", + "exitcode": 1, "stderr": "someerror", - "exitcode": 1 + "stdout": "somemessage" } - ] + ], + "env": [ + "BISECT_STAGE=someBisectStage", + "BISECT_DIR=someBisectDir", + "HOME=/user/home" + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "main.cc" + ], + "path": "./x86_64-cros-linux-gnu-clang" + }, + "exitcode": 1, + "stderr": "someerror", + "stdout": "somemessage" + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json index 35f90b1e..f81d88c6 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json @@ -1,46 +1,34 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", - "args": [ - "-ftrapv", - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-ftrapv", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -50,53 +38,52 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-eabi-clang", "args": [ "-ftrapv", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-eabi", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-eabi-", "-ftrapv", "main.cc", "-L/usr/x86_64-cros-eabi/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -106,53 +93,52 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-win-gnu-clang", "args": [ "-ftrapv", "main.cc" - ] + ], + "path": "./x86_64-cros-eabi-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-win-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-win-gnu-", "-ftrapv", "main.cc", "-L/usr/x86_64-cros-win-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -162,54 +148,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-linux-gnu-clang", "args": [ "-ftrapv", "main.cc" - ] + ], + "path": "./x86_64-cros-win-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-linux-gnu-", "-ftrapv", "main.cc", "-L/usr/armv7m-cros-linux-gnu/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv7m-cros-linux-gnu" @@ -218,53 +203,52 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-eabi-clang", "args": [ "-ftrapv", "main.cc" - ] + ], + "path": "./armv7m-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-eabi", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/armv7m-cros-eabi-", "-ftrapv", "main.cc", "-L/usr/armv7m-cros-eabi/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv7m-cros-eabi" @@ -273,54 +257,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-win-gnu-clang", "args": [ "-ftrapv", "main.cc" - ] + ], + "path": "./armv7m-cros-eabi-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-win-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-win-gnu-", "-ftrapv", "main.cc", "-L/usr/armv7m-cros-win-gnu/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv7m-cros-win-gnu" @@ -329,54 +312,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-linux-gnu-clang", "args": [ "-ftrapv", "main.cc" - ] + ], + "path": "./armv7m-cros-win-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-linux-gnu-", "-ftrapv", "main.cc", "-L/usr/armv8m-cros-linux-gnu/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv8m-cros-linux-gnu" @@ -385,53 +367,52 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-eabi-clang", "args": [ "-ftrapv", "main.cc" - ] + ], + "path": "./armv8m-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-eabi", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/armv8m-cros-eabi-", "-ftrapv", "main.cc", "-L/usr/armv8m-cros-eabi/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv8m-cros-eabi" @@ -440,54 +421,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-win-gnu-clang", "args": [ "-ftrapv", "main.cc" - ] + ], + "path": "./armv8m-cros-eabi-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-win-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-win-gnu-", "-ftrapv", "main.cc", "-L/usr/armv8m-cros-win-gnu/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv8m-cros-win-gnu" @@ -496,9 +476,20 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "-ftrapv", + "main.cc" + ], + "path": "./armv8m-cros-win-gnu-clang" + } + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json index e2479e9b..5d8f5bea 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json @@ -1,44 +1,33 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", - "args": [ - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -48,51 +37,50 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-eabi-clang", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-eabi", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-eabi-", "main.cc", "-L/usr/x86_64-cros-eabi/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -102,51 +90,50 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-win-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-eabi-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-win-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-win-gnu-", "main.cc", "-L/usr/x86_64-cros-win-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -156,52 +143,51 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-win-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-linux-gnu-", "main.cc", "-L/usr/armv7m-cros-linux-gnu/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv7m-cros-linux-gnu" @@ -210,51 +196,50 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-eabi-clang", "args": [ "main.cc" - ] + ], + "path": "./armv7m-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-eabi", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/armv7m-cros-eabi-", "main.cc", "-L/usr/armv7m-cros-eabi/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv7m-cros-eabi" @@ -263,52 +248,51 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-win-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./armv7m-cros-eabi-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-win-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-win-gnu-", "main.cc", "-L/usr/armv7m-cros-win-gnu/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv7m-cros-win-gnu" @@ -317,52 +301,51 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./armv7m-cros-win-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-linux-gnu-", "main.cc", "-L/usr/armv8m-cros-linux-gnu/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv8m-cros-linux-gnu" @@ -371,51 +354,50 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-eabi-clang", "args": [ "main.cc" - ] + ], + "path": "./armv8m-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-eabi", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/armv8m-cros-eabi-", "main.cc", "-L/usr/armv8m-cros-eabi/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv8m-cros-eabi" @@ -424,52 +406,51 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-win-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./armv8m-cros-eabi-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-win-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-win-gnu-", "main.cc", "-L/usr/armv8m-cros-win-gnu/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv8m-cros-win-gnu" @@ -478,9 +459,19 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "main.cc" + ], + "path": "./armv8m-cros-win-gnu-clang" + } + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json index 11c566b6..768f2b28 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json @@ -1,44 +1,33 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", - "args": [ - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -48,54 +37,50 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] - }, - "stdout": "somemessage", - "stderr": "someerror", - "exitcode": 1 - }, + ], + "path": "./x86_64-cros-linux-gnu-clang" + } + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -105,54 +90,56 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" }, - "stdout": "somemessage", + "exitcode": 1, "stderr": "someerror", - "exitcode": 1 + "stdout": "somemessage" } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang++", "args": [ "main.cc" - ] - } - }, + ], + "path": "./x86_64-cros-linux-gnu-clang" + }, + "exitcode": 1, + "stderr": "someerror", + "stdout": "somemessage" + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang++", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -162,54 +149,50 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { - "wd": "/tmp/stable", - "env": [ - "CLANG=somepath/clang" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang++" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "somepath/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -219,63 +202,64 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], + "env": [ + "CLANG=somepath/clang" + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ - "-Xclang-path=/somedir", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "../../usr/bin/clang", "args": [ "--print-resource-dir" - ] + ], + "path": "../../usr/bin/clang" }, "stdout": "someResourceDir" }, { "cmd": { - "path": "/usr/bin/ccache", "args": [ "/somedir/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -285,130 +269,125 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { - "wd": "/tmp/stable", - "env": [ - "GOMACC_PATH=/tmp/stable/gomacc" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "-Xclang-path=/somedir", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "../../usr/bin/clang", "args": [ "--print-resource-dir" - ] + ], + "path": "../../usr/bin/clang" }, "stdout": "someResourceDir" }, { "cmd": { - "path": "/tmp/stable/gomacc", "args": [ "/somedir/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu" - ] + ], + "path": "/tmp/stable/gomacc" } } - ] - }, - { + ], + "env": [ + "GOMACC_PATH=/tmp/stable/gomacc" + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "-Xclang-path=/somedir", "main.cc" - ] - }, - "stdout": "somemessage", - "stderr": "someerror", - "exitcode": 1 - }, + ], + "path": "./x86_64-cros-linux-gnu-clang" + } + } + }, + { "cmds": [ { "cmd": { - "path": "../../usr/bin/clang", "args": [ "--print-resource-dir" - ] + ], + "path": "../../usr/bin/clang" }, "stdout": "someResourceDir" }, { "cmd": { - "path": "/usr/bin/ccache", "args": [ "/somedir/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -418,54 +397,57 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" }, - "stdout": "somemessage", + "exitcode": 1, "stderr": "someerror", - "exitcode": 1 + "stdout": "somemessage" } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "/tmp/stable/x86_64-cros-linux-gnu-clang", "args": [ + "-Xclang-path=/somedir", "main.cc" - ] - } - }, + ], + "path": "./x86_64-cros-linux-gnu-clang" + }, + "exitcode": 1, + "stderr": "someerror", + "stdout": "somemessage" + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "/usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -475,51 +457,50 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "/tmp/stable/x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "a/b/c/d/e/usr/bin/clang", "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-Ba/b/c/d/e/bin", "-target", @@ -529,51 +510,50 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./symlinked/x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "a/b/c/d/e/usr/bin/clang", "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-Ba/b/c/d/e/bin", "-target", @@ -583,51 +563,50 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "somedir/x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./symlinked/x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../usr/bin/clang", "--sysroot=/tmp/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../bin", "-target", @@ -637,54 +616,50 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { - "wd": "/tmp/stable", - "env": [ - "PATH=/tmp/stable/pathenv" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "somedir/x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "/tmp/usr/bin/clang", "--sysroot=/tmp/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../bin", "-target", @@ -694,9 +669,22 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] + ], + "env": [ + "PATH=/tmp/stable/pathenv" + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "main.cc" + ], + "path": "x86_64-cros-linux-gnu-clang" + } + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json index fe0df74d..10329a58 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json @@ -1,47 +1,34 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", - "args": [ - "-fsanitize=kernel-address", - "-Wl,--no-undefined", - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -51,54 +38,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "-fsanitize=kernel-address", - "-Wl,-z,defs", + "-Wl,--no-undefined", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -108,54 +94,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "-fsanitize=kernel-address", - "-D_FORTIFY_SOURCE=1", + "-Wl,-z,defs", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -165,54 +150,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "-fsanitize=kernel-address", - "-D_FORTIFY_SOURCE=2", + "-D_FORTIFY_SOURCE=1", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -222,53 +206,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ - "-fsanitize=fuzzer", + "-fsanitize=kernel-address", + "-D_FORTIFY_SOURCE=2", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=fuzzer", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -278,55 +262,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ - "-fsanitize=address", - "-fprofile-instr-generate", + "-fsanitize=fuzzer", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=address", "-fprofile-instr-generate", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -336,53 +318,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "-fsanitize=address", + "-fprofile-instr-generate", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -392,53 +374,52 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ - "-fprofile-instr-generate", + "-fsanitize=address", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fprofile-instr-generate", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -448,9 +429,20 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "-fprofile-instr-generate", + "main.cc" + ], + "path": "./x86_64-cros-linux-gnu-clang" + } + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json index b744e8c6..be4f57a5 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json @@ -1,45 +1,29 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", - "args": [ - "-mno-movbe", - "-Wclobbered", - "-Wno-psabi", - "-Wlogical-op", - "-Wmissing-parameter-type", - "-Wold-style-declaration", - "-Woverride-init", - "-Wunsafe-loop-optimizations", - "-Wstrict-aliasing=abc", - "-finline-limit=abc", - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-mno-movbe", @@ -52,11 +36,6 @@ "-Wunsafe-loop-optimizations", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -66,53 +45,61 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ - "-Wno-error=cpp", + "-mno-movbe", + "-Wclobbered", + "-Wno-psabi", + "-Wlogical-op", + "-Wmissing-parameter-type", + "-Wold-style-declaration", + "-Woverride-init", + "-Wunsafe-loop-optimizations", + "-Wstrict-aliasing=abc", + "-finline-limit=abc", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-Wno-#warnings", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -122,53 +109,52 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ - "-Wno-error=maybe-uninitialized", + "-Wno-error=cpp", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-Wno-error=uninitialized", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -178,53 +164,52 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ - "-Xclang-only=-someflag", + "-Wno-error=maybe-uninitialized", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-someflag", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -234,9 +219,20 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "-Xclang-only=-someflag", + "main.cc" + ], + "path": "./x86_64-cros-linux-gnu-clang" + } + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json index ed3a6ef1..4f2bddb6 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json @@ -1,19 +1,8 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", - "args": [ - "-noccache", - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Wno-maybe-uninitialized", @@ -24,54 +13,51 @@ "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc.real" } } - ] - }, - { - "wd": "/tmp/stable", - "env": [ - "GOMACC_PATH=someNonExistingPath" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ + "-noccache", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -81,105 +67,105 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { - "wd": "/tmp/stable", + ], "env": [ - "GOMACC_PATH=/tmp/stable/gomacc" + "GOMACC_PATH=someNonExistingPath" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/tmp/stable/gomacc", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu" - ] + ], + "path": "/tmp/stable/gomacc" } } - ] - }, - { + ], + "env": [ + "GOMACC_PATH=/tmp/stable/gomacc" + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ - "-nopie", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-nopie", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -189,54 +175,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ - "-D__KERNEL__", + "-nopie", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "-fno-stack-protector", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-D__KERNEL__", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -246,43 +231,47 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7a-cros-linux-gnueabihf-clang", "args": [ "-D__KERNEL__", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7a-cros-linux-gnueabihf", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "-mthumb", "-fno-stack-protector", @@ -290,11 +279,6 @@ "-D__KERNEL__", "main.cc", "-L/usr/armv7a-cros-linux-gnueabihf/usr/lib", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-B../../bin", "-target", "armv7a-cros-linux-gnueabihf" @@ -303,52 +287,51 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ - "--sysroot=xyz", + "-D__KERNEL__", "main.cc" - ] + ], + "path": "./armv7a-cros-linux-gnueabihf-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "--sysroot=xyz", "main.cc", "-Lxyz/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -358,9 +341,20 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "/usr/bin/ccache" } } - ] + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "--sysroot=xyz", + "main.cc" + ], + "path": "./x86_64-cros-linux-gnu-clang" + } + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json index 830abee6..e85c065f 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json @@ -1,30 +1,17 @@ [ { - "wd": "/tmp/stable", - "env": [ - "WITH_TIDY=1" - ], - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", - "args": [ - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "../../usr/bin/clang", "args": [ "--print-resource-dir" - ] + ], + "path": "../../usr/bin/clang" }, "stdout": "someResourceDir" }, { "cmd": { - "path": "../../usr/bin/clang-tidy", "args": [ "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", "main.cc", @@ -33,98 +20,95 @@ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu" - ] + ], + "path": "../../usr/bin/clang-tidy" } }, { "cmd": { - "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu" - ] + ], + "path": "../../usr/bin/clang" } } - ] - }, - { - "wd": "/tmp/stable", + ], "env": [ - "WITH_TIDY=1", - "GOMACC_PATH=/tmp/stable/gomacc" + "WITH_TIDY=1" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "../../usr/bin/clang", "args": [ "--print-resource-dir" - ] + ], + "path": "../../usr/bin/clang" }, "stdout": "someResourceDir" }, { "cmd": { - "path": "../../usr/bin/clang-tidy", "args": [ "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", "main.cc", @@ -133,101 +117,97 @@ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu" - ] + ], + "path": "../../usr/bin/clang-tidy" } }, { "cmd": { - "path": "/tmp/stable/gomacc", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu" - ] + ], + "path": "/tmp/stable/gomacc" } } - ] - }, - { - "wd": "/tmp/stable", + ], "env": [ "WITH_TIDY=1", "GOMACC_PATH=/tmp/stable/gomacc" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] - }, - "stdout": "somemessage", - "stderr": "someerrorclang-tidy failed" - }, + ], + "path": "./x86_64-cros-linux-gnu-clang" + } + } + }, + { "cmds": [ { "cmd": { - "path": "../../usr/bin/clang", "args": [ "--print-resource-dir" - ] + ], + "path": "../../usr/bin/clang" }, "stdout": "someResourceDir" }, { "cmd": { - "path": "../../usr/bin/clang-tidy", "args": [ "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", "main.cc", @@ -236,105 +216,102 @@ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu" - ] + ], + "path": "../../usr/bin/clang-tidy" }, - "stdout": "somemessage", + "exitcode": 1, "stderr": "someerror", - "exitcode": 1 + "stdout": "somemessage" }, { "cmd": { - "path": "/tmp/stable/gomacc", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu" - ] + ], + "path": "/tmp/stable/gomacc" } } - ] - }, - { - "wd": "/tmp/stable", + ], "env": [ "WITH_TIDY=1", "GOMACC_PATH=/tmp/stable/gomacc" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" }, - "stdout": "somemessage", - "stderr": "someerror", - "exitcode": 1 - }, + "stderr": "someerrorclang-tidy failed", + "stdout": "somemessage" + } + }, + { "cmds": [ { "cmd": { - "path": "../../usr/bin/clang", "args": [ "--print-resource-dir" - ] + ], + "path": "../../usr/bin/clang" }, "stdout": "someResourceDir" }, { "cmd": { - "path": "../../usr/bin/clang-tidy", "args": [ "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", "main.cc", @@ -343,73 +320,88 @@ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu" - ] + ], + "path": "../../usr/bin/clang-tidy" } }, { "cmd": { - "path": "/tmp/stable/gomacc", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu" - ] + ], + "path": "/tmp/stable/gomacc" }, - "stdout": "somemessage", + "exitcode": 1, "stderr": "someerror", - "exitcode": 1 + "stdout": "somemessage" } - ] + ], + "env": [ + "WITH_TIDY=1", + "GOMACC_PATH=/tmp/stable/gomacc" + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "main.cc" + ], + "path": "./x86_64-cros-linux-gnu-clang" + }, + "exitcode": 1, + "stderr": "someerror", + "stdout": "somemessage" + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json index 07c20900..7e4b4d6f 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json @@ -1,47 +1,33 @@ [ { - "wd": "/tmp/stable", - "env": [ - "FORCE_DISABLE_WERROR=1" - ], - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", - "args": [ - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -51,54 +37,53 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "ccache" } } - ] - }, - { - "wd": "/tmp/stable", + ], "env": [ "FORCE_DISABLE_WERROR=1" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -108,40 +93,39 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "ccache" }, - "stderr": "-Werror originalerror", - "exitcode": 1 + "exitcode": 1, + "stderr": "error: foo [-Werror,-Wfoo]" }, { "cmd": { - "path": "ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -153,56 +137,54 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "ccache" } } - ] - }, - { - "wd": "/tmp/stable", + ], "env": [ "FORCE_DISABLE_WERROR=1" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-clang", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-clang" }, - "stderr": "-Werror originalerror", - "exitcode": 1 - }, + "stdout": "$CROS_ARTIFACTS_TMP_DIR is not set, artifacts will be written to /tmp" + } + }, + { "cmds": [ { "cmd": { - "path": "ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -212,40 +194,39 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "ccache" }, - "stderr": "-Werror originalerror", - "exitcode": 1 + "exitcode": 1, + "stderr": "error: foo [-Werror,-Wfoo]" }, { "cmd": { - "path": "ccache", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -257,12 +238,27 @@ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" - ] + ], + "path": "ccache" }, - "stdout": "somemessage", + "exitcode": 1, "stderr": "someerror", - "exitcode": 1 + "stdout": "somemessage" } - ] + ], + "env": [ + "FORCE_DISABLE_WERROR=1" + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "main.cc" + ], + "path": "./x86_64-cros-linux-gnu-clang" + }, + "exitcode": 1, + "stderr": "error: foo [-Werror,-Wfoo]" + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json index 9dd5687b..daa023fc 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json @@ -1,56 +1,44 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", - "args": [ - "-clang-syntax", - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu", "-fsyntax-only", "-stdlib=libstdc++" - ] + ], + "path": "../../usr/bin/clang" } }, { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -66,67 +54,63 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { - "wd": "/tmp/stable", - "env": [ - "GOMACC_PATH=/tmp/stable/gomacc" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ "-clang-syntax", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/tmp/stable/gomacc", "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu", "-fsyntax-only", "-stdlib=libstdc++" - ] + ], + "path": "/tmp/stable/gomacc" } }, { "cmd": { - "path": "/tmp/stable/gomacc", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -138,123 +122,121 @@ "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" - ] + ], + "path": "/tmp/stable/gomacc" } } - ] - }, - { + ], + "env": [ + "GOMACC_PATH=/tmp/stable/gomacc" + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ "-clang-syntax", "main.cc" - ] - }, - "stdout": "somemessage", - "stderr": "someerror", - "exitcode": 1 - }, + ], + "path": "./x86_64-cros-linux-gnu-gcc" + } + } + }, + { "cmds": [ { "cmd": { - "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu", "-fsyntax-only", "-stdlib=libstdc++" - ] + ], + "path": "../../usr/bin/clang" }, - "stdout": "somemessage", + "exitcode": 1, "stderr": "someerror", - "exitcode": 1 + "stdout": "somemessage" } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ "-clang-syntax", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" }, - "stdout": "somemessage", + "exitcode": 1, "stderr": "someerror", - "exitcode": 1 - }, + "stdout": "somemessage" + } + }, + { "cmds": [ { "cmd": { - "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Qunused-arguments", "-Werror=poison-system-directories", - "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-Wno-error=vla-cxx-extension", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + "-fclang-abi-compat=17", "-Wno-section", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", - "-Wno-compound-token-split-by-space", - "-Wno-deprecated-copy", - "-Wno-unused-but-set-variable", - "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", "x86_64-cros-linux-gnu", "-fsyntax-only", "-stdlib=libstdc++" - ] + ], + "path": "../../usr/bin/clang" } }, { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -270,12 +252,26 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" }, - "stdout": "somemessage", + "exitcode": 1, "stderr": "someerror", - "exitcode": 1 + "stdout": "somemessage" } - ] + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "-clang-syntax", + "main.cc" + ], + "path": "./x86_64-cros-linux-gnu-gcc" + }, + "exitcode": 1, + "stderr": "someerror", + "stdout": "somemessage" + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json index 24f90fbf..1997a6dd 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json @@ -1,18 +1,8 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", - "args": [ - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -28,25 +18,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-eabi-gcc", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-eabi-gcc.real", "--sysroot=/usr/x86_64-cros-eabi", @@ -62,25 +52,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-win-gnu-gcc", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-eabi-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-win-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-win-gnu", @@ -96,25 +86,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-linux-gnu-gcc", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-win-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./armv7m-cros-linux-gnu-gcc.real", "--sysroot=/usr/armv7m-cros-linux-gnu", @@ -130,25 +120,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-eabi-gcc", "args": [ "main.cc" - ] + ], + "path": "./armv7m-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./armv7m-cros-eabi-gcc.real", "--sysroot=/usr/armv7m-cros-eabi", @@ -163,25 +153,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-win-gnu-gcc", "args": [ "main.cc" - ] + ], + "path": "./armv7m-cros-eabi-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./armv7m-cros-win-gnu-gcc.real", "--sysroot=/usr/armv7m-cros-win-gnu", @@ -197,25 +187,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-linux-gnu-gcc", "args": [ "main.cc" - ] + ], + "path": "./armv7m-cros-win-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./armv8m-cros-linux-gnu-gcc.real", "--sysroot=/usr/armv8m-cros-linux-gnu", @@ -231,25 +221,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-eabi-gcc", "args": [ "main.cc" - ] + ], + "path": "./armv8m-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./armv8m-cros-eabi-gcc.real", "--sysroot=/usr/armv8m-cros-eabi", @@ -264,25 +254,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-win-gnu-gcc", "args": [ "main.cc" - ] + ], + "path": "./armv8m-cros-eabi-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./armv8m-cros-win-gnu-gcc.real", "--sysroot=/usr/armv8m-cros-win-gnu", @@ -298,9 +288,19 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "main.cc" + ], + "path": "./armv8m-cros-win-gnu-gcc" + } + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json index b2662930..c8cf7679 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json @@ -1,18 +1,8 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", - "args": [ - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -28,28 +18,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ "main.cc" - ] - }, - "stdout": "somemessage", - "stderr": "someerror", - "exitcode": 1 - }, + ], + "path": "./x86_64-cros-linux-gnu-gcc" + } + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -65,28 +52,31 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" }, - "stdout": "somemessage", + "exitcode": 1, "stderr": "someerror", - "exitcode": 1 + "stdout": "somemessage" } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "/tmp/stable/x86_64-cros-linux-gnu-gcc", "args": [ "main.cc" - ] - } - }, + ], + "path": "./x86_64-cros-linux-gnu-gcc" + }, + "exitcode": 1, + "stderr": "someerror", + "stdout": "somemessage" + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "/tmp/stable/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -102,25 +92,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc", "args": [ "main.cc" - ] + ], + "path": "/tmp/stable/x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", @@ -136,25 +126,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./symlinked/x86_64-cros-linux-gnu-gcc", "args": [ "main.cc" - ] + ], + "path": "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./symlinked/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", @@ -170,28 +160,25 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { - "wd": "/tmp/stable", - "env": [ - "PATH=/tmp/stable/pathenv" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "x86_64-cros-linux-gnu-gcc", "args": [ "main.cc" - ] + ], + "path": "./symlinked/x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "/tmp/stable/pathenv/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -207,9 +194,22 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] + ], + "env": [ + "PATH=/tmp/stable/pathenv" + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "main.cc" + ], + "path": "x86_64-cros-linux-gnu-gcc" + } + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json index 79e02c3d..8603c168 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json @@ -1,20 +1,8 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", - "args": [ - "-fsanitize=kernel-address", - "-Wl,--no-undefined", - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -31,27 +19,27 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ "-fsanitize=kernel-address", - "-Wl,-z,defs", + "-Wl,--no-undefined", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -68,27 +56,27 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ "-fsanitize=kernel-address", - "-D_FORTIFY_SOURCE=1", + "-Wl,-z,defs", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -105,27 +93,27 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ "-fsanitize=kernel-address", - "-D_FORTIFY_SOURCE=2", + "-D_FORTIFY_SOURCE=1", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -142,26 +130,27 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ - "-fsanitize=fuzzer", + "-fsanitize=kernel-address", + "-D_FORTIFY_SOURCE=2", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -178,27 +167,26 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ - "-fsanitize=address", - "-fprofile-instr-generate", + "-fsanitize=fuzzer", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -216,26 +204,27 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ "-fsanitize=address", + "-fprofile-instr-generate", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -252,26 +241,26 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ - "-fprofile-instr-generate", + "-fsanitize=address", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -288,9 +277,20 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "-fprofile-instr-generate", + "main.cc" + ], + "path": "./x86_64-cros-linux-gnu-gcc" + } + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json index e0fe5515..2e4a1b15 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json @@ -1,19 +1,8 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", - "args": [ - "-march=goldmont", - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -30,26 +19,26 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ - "-march=goldmont-plus", + "-march=goldmont", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -66,26 +55,26 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ - "-march=skylake", + "-march=goldmont-plus", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -102,9 +91,20 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "-march=skylake", + "main.cc" + ], + "path": "./x86_64-cros-linux-gnu-gcc" + } + } } ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json index 25411f20..35ead1b4 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json @@ -1,19 +1,8 @@ [ { - "wd": "/tmp/stable", - "wrapper": { - "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", - "args": [ - "-noccache", - "main.cc" - ] - } - }, "cmds": [ { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", "-Wno-maybe-uninitialized", @@ -24,28 +13,26 @@ "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc.real" } } - ] - }, - { - "wd": "/tmp/stable", - "env": [ - "GOMACC_PATH=someNonExistingPath" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ + "-noccache", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -61,28 +48,28 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { - "wd": "/tmp/stable", + ], "env": [ - "GOMACC_PATH=/tmp/stable/gomacc" + "GOMACC_PATH=someNonExistingPath" ], + "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/tmp/stable/gomacc", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -94,26 +81,28 @@ "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" - ] + ], + "path": "/tmp/stable/gomacc" } } - ] - }, - { + ], + "env": [ + "GOMACC_PATH=/tmp/stable/gomacc" + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ - "-nopie", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -130,26 +119,26 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ - "-D__KERNEL__", + "-nopie", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", @@ -167,26 +156,26 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7a-cros-linux-gnueabihf-gcc", "args": [ "-D__KERNEL__", "main.cc" - ] + ], + "path": "./x86_64-cros-linux-gnu-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./armv7a-cros-linux-gnueabihf-gcc.real", "--sysroot=/usr/armv7a-cros-linux-gnueabihf", @@ -204,26 +193,26 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] - }, - { + ], "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-gnu-gcc", "args": [ - "--sysroot=xyz", + "-D__KERNEL__", "main.cc" - ] + ], + "path": "./armv7a-cros-linux-gnueabihf-gcc" } - }, + } + }, + { "cmds": [ { "cmd": { - "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", "-Wno-maybe-uninitialized", @@ -239,9 +228,20 @@ "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" - ] + ], + "path": "/usr/bin/ccache" } } - ] + ], + "wd": "/tmp/stable", + "wrapper": { + "cmd": { + "args": [ + "--sysroot=xyz", + "main.cc" + ], + "path": "./x86_64-cros-linux-gnu-gcc" + } + } } ] |