diff --git a/test/targets/clang_strict.yml b/test/targets/clang.yml similarity index 91% rename from test/targets/clang_strict.yml rename to test/targets/clang.yml index 9063f8c..8af2342 100644 --- a/test/targets/clang_strict.yml +++ b/test/targets/clang.yml @@ -7,11 +7,6 @@ # CMock overlay for vendor/unity/test/targets/clang_strict.yml # Only contains additions not present in the Unity base target. - -:defines: - :test: - - UNITY_POINTER_WIDTH=64 - :unsupported: - out_of_memory - callingconv diff --git a/test/targets/gcc_32.yml b/test/targets/gcc_32.yml index 1afba39..5206d66 100644 --- a/test/targets/gcc_32.yml +++ b/test/targets/gcc_32.yml @@ -8,10 +8,6 @@ # CMock overlay for vendor/unity/test/targets/gcc_32.yml # Only contains additions not present in the Unity base target. --- -:defines: - :test: - - UNITY_SUPPORT_64 - :unsupported: - out_of_memory - unity_64bit_support diff --git a/test/targets/gcc_64.yml b/test/targets/gcc_64.yml index 61a9de9..3eb837c 100644 --- a/test/targets/gcc_64.yml +++ b/test/targets/gcc_64.yml @@ -7,11 +7,6 @@ # CMock overlay for vendor/unity/test/targets/gcc_64.yml # Only contains additions not present in the Unity base target. - -:defines: - :test: - - UNITY_POINTER_WIDTH=64 - :unsupported: - out_of_memory - callingconv diff --git a/test/targets/iar_arm_v4.yml b/test/targets/iar_arm.yml similarity index 100% rename from test/targets/iar_arm_v4.yml rename to test/targets/iar_arm.yml diff --git a/test/targets/iar_arm_v5.yml b/test/targets/iar_arm_v5.yml deleted file mode 100644 index 443e5b2..0000000 --- a/test/targets/iar_arm_v5.yml +++ /dev/null @@ -1,16 +0,0 @@ -# ========================================================================= -# CMock - Automatic Mock Generation for C -# ThrowTheSwitch.org -# Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams -# SPDX-License-Identifier: MIT -# ========================================================================= - -# CMock overlay for vendor/unity/test/targets/iar_arm_v5.yml -# Only contains additions not present in the Unity base target. - -:unsupported: - - out_of_memory - - nonstandard_parsed_stuff_1 - - const - - callingconv - - unity_64bit_support diff --git a/test/targets/gcc_tiny.yml b/test/targets/tiny.yml similarity index 63% rename from test/targets/gcc_tiny.yml rename to test/targets/tiny.yml index a8064da..b01bc16 100644 --- a/test/targets/gcc_tiny.yml +++ b/test/targets/tiny.yml @@ -6,36 +6,6 @@ # ========================================================================= --- -colour: true -:tools: - :test_compiler: - :name: compiler - :executable: gcc - :arguments: - - "-c" - - "-Wall" - - "-Wextra" - - "-Wunused-parameter" - - "-Wno-address" - - "-Wno-invalid-token-paste" - - "-std=c99" - - "-pedantic" - - "-O0" - - '-I"$": COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE' - - '-I"$": COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR' - - "-D$: COLLECTION_DEFINES_TEST_AND_VENDOR" - - "${1}" - - "-o ${2}" - :test_linker: - :name: linker - :executable: gcc - :arguments: - - "${1}" - - "-lm" - - "-o ${2}" -:extension: - :object: ".o" - :executable: ".exe" :defines: :test: - CMOCK_MEM_STATIC diff --git a/vendor/unity b/vendor/unity index 5e3a3db..ed99435 160000 --- a/vendor/unity +++ b/vendor/unity @@ -1 +1 @@ -Subproject commit 5e3a3db2f17aa71778b6e52c4879d884705625fb +Subproject commit ed994351776f875fd64f800ec88819470f2c00fb