From 2051e500cbcef969f72d740a2b495d17ef4c9baf Mon Sep 17 00:00:00 2001 From: mvandervoord Date: Sun, 14 Mar 2010 01:50:53 +0000 Subject: [PATCH] - fixed order of test assert bits - test_runner_generator now protects against directories in include statements git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@61 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e --- auto/generate_test_runner.rb | 2 +- src/unity.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index f81ee65..c486661 100644 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -104,7 +104,7 @@ class UnityTestRunnerGenerator def find_mocks(includes) mock_headers = [] includes.each do |include_file| - mock_headers << include_file if (include_file =~ /^mock/i) + mock_headers << File.basename(include_file) if (include_file =~ /^mock/i) end return mock_headers end diff --git a/src/unity.c b/src/unity.c index 0efaf27..66860ed 100644 --- a/src/unity.c +++ b/src/unity.c @@ -109,7 +109,7 @@ void UnityPrintNumberHex(const unsigned long number, const char nibbles_to_print void UnityPrintMask(const unsigned long mask, const unsigned long number) { - unsigned long bit = 0x00000001; + unsigned long bit = 0x80000000; long i; for (i = 0; i < 32; i++) @@ -129,7 +129,7 @@ void UnityPrintMask(const unsigned long mask, const unsigned long number) { UNITY_OUTPUT_CHAR('X'); } - bit = bit << 1; + bit = bit >> 1; } }