From 98e8590fce46ecc8aaab3c7b5efe52c345e0aee4 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Tue, 18 Aug 2015 08:03:50 -0400 Subject: [PATCH] Use correct macro for unity_fixture's FAIL. Output used headers from test runner generator --- auto/generate_test_runner.rb | 3 +-- extras/fixture/src/unity_fixture.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index e29a9be..cb9d1e7 100644 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -369,6 +369,5 @@ if ($0 == __FILE__) #create the default test runner name if not specified ARGV[1] = ARGV[0].gsub(".c","_Runner.c") if (!ARGV[1]) - - UnityTestRunnerGenerator.new(options).run(ARGV[0], ARGV[1]) + puts UnityTestRunnerGenerator.new(options).run(ARGV[0], ARGV[1]).inspect end diff --git a/extras/fixture/src/unity_fixture.h b/extras/fixture/src/unity_fixture.h index f4f9825..63ec404 100644 --- a/extras/fixture/src/unity_fixture.h +++ b/extras/fixture/src/unity_fixture.h @@ -75,7 +75,7 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void)); #define UT_PTR_SET(ptr, newPointerValue) UnityPointer_Set((void**)&ptr, (void*)newPointerValue) #define TEST_ASSERT_POINTERS_EQUAL(expected, actual) TEST_ASSERT_EQUAL_PTR(expected, actual) #define TEST_ASSERT_BYTES_EQUAL(expected, actual) TEST_ASSERT_EQUAL_HEX8(0xff & (expected), 0xff & (actual)) -#define FAIL(message) TEST_FAIL((message)) +#define FAIL(message) TEST_FAIL_MESSAGE((message)) #define CHECK(condition) TEST_ASSERT_TRUE((condition)) #define LONGS_EQUAL(expected, actual) TEST_ASSERT_EQUAL_INT((expected), (actual)) #define STRCMP_EQUAL(expected, actual) TEST_ASSERT_EQUAL_STRING((expected), (actual))