Skip to content
Browse files

Simplify Rakefile build

* gem install doesn't depend on rake
* Always build tests during rake
  • Loading branch information...
1 parent b5ca7e6 commit 0cffabde39587ce692de6adcd41b50d9391cd133 @jferris jferris committed
Showing with 4 additions and 9 deletions.
  1. +4 −9 Rakefile
13 Rakefile
@@ -7,7 +7,7 @@ Bundler::GemHelper.install_tasks
desc "Generate a Makefile using qmake"
file 'Makefile' do
- CapybaraWebkitBuilder.makefile or exit(1)
+ CapybaraWebkitBuilder.makefile('CONFIG+=test') or exit(1)
desc "Regenerate dependencies using qmake"
@@ -20,15 +20,8 @@ task :build => :qmake do or exit(1)
-task :makefile_test do
- CapybaraWebkitBuilder.makefile('CONFIG+=test') or exit(1)
-desc "Build the webkit server for running tests"
-task :build_test => [:makefile_test, :build]
desc "Run QtTest unit tests for webkit server"
-task :check => :build_test do
+task :check => :build do
sh("make check") or exit(1)
@@ -39,6 +32,8 @@ do |t|
t.rspec_opts = "--format progress"
+task :spec => :build
desc "Default: build and run all specs"
task :default => [:check, :spec]

0 comments on commit 0cffabd

Please sign in to comment.
Something went wrong with that request. Please try again.