Merge branch 'master' of https://github.com/ThrowTheSwitch/Unity

.travis.yml

@@ -2,7 +2,5 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
-install:
-  - bundle install
 script:
-  - bundle exec rake ci
+  - rake ci

Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org/"
-
-gem "rake"
-gem "test-unit", "2.4.3"

Gemfile.lock

@@ -1,12 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    rake (10.3.2)
-    test-unit (2.4.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake
-  test-unit (= 2.4.3)

Rakefile

@@ -24,8 +24,13 @@ task :prepare_for_tests => TEMP_DIRS
 
 include RakefileHelpers
 
-# Load default configuration, for now
-DEFAULT_CONFIG_FILE = 'gcc_32.yml'
+# Load proper GCC as defult configuration
+if 1.size == 8 # 8 bytes => 64-bits
+  DEFAULT_CONFIG_FILE = 'gcc_64.yml'
+else # Assume 32-bit otherwise
+  DEFAULT_CONFIG_FILE = 'gcc_32.yml'
+end
+
 configure_toolchain(DEFAULT_CONFIG_FILE)
 
 desc "Test unity with its own unit tests"