Skip to content

Commit

Permalink
Replace animated-happiness/chou with ios-smoke-test-app/CalSmokeApp
Browse files Browse the repository at this point in the history
  • Loading branch information
jmoody committed Mar 25, 2015
1 parent 915e68b commit a0359ff
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -15,7 +15,7 @@ calabash-dylibs
.idea

# CI pulls down these two repos from github
animated-happiness
ios-smoke-test-app
calabash-ios

.ruby-version
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -17,7 +17,7 @@ script:
#- make all
- make dylib_sim
- scripts/test/xctest.rb
- scripts/test/run-chou-tests.rb
- scripts/test/run-ios-simulator-smoke-tests.rb

notifications:
email:
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/travis/local-run-as-travis.rb
Expand Up @@ -20,5 +20,5 @@
do_system('make dylibs', {:env_vars => env_vars})
do_system('make all', {:env_vars => env_vars})
do_system('scripts/test/xctest.rb', {:env_vars => env_vars})
do_system('scripts/test/run-chou-tests.rb', {:env_vars => env_vars})
do_system('scripts/test/run-ios-simulator-smoke-tests.rb', {:env_vars => env_vars})
end
2 changes: 1 addition & 1 deletion scripts/test/run
Expand Up @@ -14,5 +14,5 @@ Dir.chdir working_dir do
do_system('make clean')
do_system('scripts/test/test-make-rules.rb', {:env_vars => env_vars})
do_system('scripts/test/xctest.rb', {:env_vars => env_vars})
do_system('scripts/test/run-chou-tests.rb', {:env_vars => env_vars})
do_system('scripts/test/run-ios-simulator-smoke-tests.rb', {:env_vars => env_vars})
end
Expand Up @@ -14,9 +14,9 @@

do_system('git clone --depth 1 --branch develop --recursive https://github.com/calabash/calabash-ios')

do_system('rm -rf animated-happiness')
do_system('rm -rf ios-smoke-test-app')

do_system('git clone --depth 1 --recursive https://github.com/jmoody/animated-happiness.git')
do_system('git clone --depth 1 --recursive https://github.com/calabash/ios-smoke-test-app.git')

# if calabash.framework exists, it was built in another step
unless File.exist?('calabash.framework')
Expand Down Expand Up @@ -63,7 +63,7 @@

end

chou_working_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'animated-happiness/chou'))
chou_working_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'ios-smoke-test-app/CalSmokeApp'))

FileUtils.rm_rf("#{chou_working_dir}/calabash.framework")
FileUtils.cp_r(calabash_framework, chou_working_dir)
Expand All @@ -88,7 +88,7 @@
end
end

animated_happiness_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'animated-happiness'))
animated_happiness_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'ios-smoke-test-app'))

Dir.chdir animated_happiness_dir do

Expand Down

0 comments on commit a0359ff

Please sign in to comment.