diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:46:48 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:46:48 +0000 |
| commit | 76168e23fd78d276a197cc992bb6ef5a065f6f3f (patch) | |
| tree | f15093086b2ff767968e6bbd1b816c66f35bd5dd /lib/tasks | |
| parent | fb2b20037bb176533de4e7fa86701248473f8ee3 (diff) | |
| parent | 589d9b8c1e14bb7086a6b7baf0fa7e3b9aaeabf0 (diff) | |
Merge branch 'develop' into xapian-dcabo
Conflicts:
spec/models/xapian_spec.rb
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/rspec.rake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake index 588c26378..4024a6a6d 100644 --- a/lib/tasks/rspec.rake +++ b/lib/tasks/rspec.rake @@ -53,7 +53,8 @@ end task :default => :spec task :stats => "spec:statsetup" -task :spec => ['spec:commonlib'] +# XXX commonlib tests are not Ruby 1.9 compatible +#task :spec => ['spec:commonlib'] task :test => ['spec'] task :cruise => ['spec'] |