Simplify Rakefile build
* gem install doesn't depend on rake * Always build tests during rake
This commit is contained in:
parent
b5ca7e6057
commit
0cffabde39
13
Rakefile
13
Rakefile
|
@ -7,7 +7,7 @@ Bundler::GemHelper.install_tasks
|
||||||
|
|
||||||
desc "Generate a Makefile using qmake"
|
desc "Generate a Makefile using qmake"
|
||||||
file 'Makefile' do
|
file 'Makefile' do
|
||||||
CapybaraWebkitBuilder.makefile or exit(1)
|
CapybaraWebkitBuilder.makefile('CONFIG+=test') or exit(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
desc "Regenerate dependencies using qmake"
|
desc "Regenerate dependencies using qmake"
|
||||||
|
@ -20,15 +20,8 @@ task :build => :qmake do
|
||||||
CapybaraWebkitBuilder.build or exit(1)
|
CapybaraWebkitBuilder.build or exit(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
task :makefile_test do
|
|
||||||
CapybaraWebkitBuilder.makefile('CONFIG+=test') or exit(1)
|
|
||||||
end
|
|
||||||
|
|
||||||
desc "Build the webkit server for running tests"
|
|
||||||
task :build_test => [:makefile_test, :build]
|
|
||||||
|
|
||||||
desc "Run QtTest unit tests for webkit server"
|
desc "Run QtTest unit tests for webkit server"
|
||||||
task :check => :build_test do
|
task :check => :build do
|
||||||
sh("make check") or exit(1)
|
sh("make check") or exit(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -39,6 +32,8 @@ RSpec::Core::RakeTask.new do |t|
|
||||||
t.rspec_opts = "--format progress"
|
t.rspec_opts = "--format progress"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
task :spec => :build
|
||||||
|
|
||||||
desc "Default: build and run all specs"
|
desc "Default: build and run all specs"
|
||||||
task :default => [:check, :spec]
|
task :default => [:check, :spec]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue