Permalink
Browse files

Revert recent build change -- it's not working on Travis CI.

I need to head to bed in a bit and I don't want to leave the build
broken. I'll put this in a branch and play with it there to
get it to work.

- Revert "Improve how we find the path to the rspec exe."
  This reverts commit cafef45.
- Revert "Run all specs together and in isolation for build."
  This reverts commit b0d5007.
  • Loading branch information...
myronmarston committed Aug 26, 2012
1 parent cafef45 commit aa4530d40eab8fa3d453f4250cb5818d08bfe319
Showing with 1 addition and 43 deletions.
  1. +0 −1 .gitignore
  2. +1 −1 .travis.yml
  3. +0 −13 script/find_path_to_rspec_exe
  4. +0 −28 script/test_all
View
@@ -13,4 +13,3 @@ Gemfile.lock
bin
.rbx
Gemfile-custom
-bundle
View
@@ -1,4 +1,4 @@
-script: "script/test_all && bin/rake cucumber --trace 2>&1"
+script: "bin/rake --trace 2>&1"
bundler_args: "--binstubs"
rvm:
- 1.8.7
@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.expand_path('../../bundle/bundler/setup', __FILE__)
-$LOAD_PATH.each do |path|
- next unless path =~ %r|rspec-core/lib$|
- rspec_exe = File.expand_path('../exe/rspec', path)
-
- if File.exist?(rspec_exe)
- puts rspec_exe
- exit(0)
- end
-end
-
View
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-function print_and_run {
- echo $1
- ($1)
-}
-
-set -e
-
-echo "Bundling Standalone so we can run the specs w/o bundler loaded"
-
-bundle install --standalone
-path_to_rspec_exe=`script/find_path_to_rspec_exe`
-
-command_prefix="ruby -w -r./bundle/bundler/setup.rb -S $path_to_rspec_exe"
-
-echo "Running all..."
-
-print_and_run "$command_prefix spec --format progress --profile"
-
-echo
-echo "--------------------------------------------------------------------"
-echo
-
-for file in `find spec -iname '*_spec.rb'`; do
- print_and_run "$command_prefix $file --format progress"
-done
-

0 comments on commit aa4530d

Please sign in to comment.