diff --git a/script/ci/before.sh b/script/ci/before.sh index 728f0c3bc..999d5784b 100755 --- a/script/ci/before.sh +++ b/script/ci/before.sh @@ -13,11 +13,11 @@ sh -e /etc/init.d/xvfb start #bundle exec sass -q --update public/stylesheets/sass/:public/stylesheets/ # setup swapfile -echo "creating a swapfile" -sudo dd if=/dev/zero of=swapfile bs=1M count=96 -sudo mkswap swapfile -sudo swapon swapfile -sudo sysctl vm.swappiness=100 +#echo "creating a swapfile" +#sudo dd if=/dev/zero of=swapfile bs=1M count=96 +#sudo mkswap swapfile +#sudo swapon swapfile +#sudo sysctl vm.swappiness=100 # Create a database.yml for the right database echo "Setting up database.yml for $DB" diff --git a/spec/support/deferred_garbage_collection.rb b/spec/support/deferred_garbage_collection.rb index fb518230b..390ec140c 100644 --- a/spec/support/deferred_garbage_collection.rb +++ b/spec/support/deferred_garbage_collection.rb @@ -30,7 +30,7 @@ class DeferredGarbageCollection else running_out_of_memory = false end - + if( (DEFERRED_GC_THRESHOLD > 0 && Time.now - @@last_gc_run >= DEFERRED_GC_THRESHOLD) || running_out_of_memory ) GC.enable GC.start @@ -40,7 +40,7 @@ class DeferredGarbageCollection end def self.unsupported_enviroment - # ENV['TRAVIS'] + ENV['TRAVIS'] # TODO: enable for ruby 1.9.3 or more RAM end end