[rubygem-thin] Fixed broken rspec tests

Michal Fojtik mfojtik at fedoraproject.org
Tue Mar 1 15:20:03 UTC 2011


commit 839eb4959a551a0ff10594ac01d8c01f7ab93c14
Author: Michal Fojtik <mfojtik at redhat.com>
Date:   Tue Mar 1 16:19:33 2011 +0100

    Fixed broken rspec tests

 rubygem-thin.spec |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/rubygem-thin.spec b/rubygem-thin.spec
index 238e848..a4c581b 100644
--- a/rubygem-thin.spec
+++ b/rubygem-thin.spec
@@ -74,7 +74,6 @@ for f in $(find %{buildroot}%{geminstdir} -name \*.rb); do
 done
 find %{buildroot}%{geminstdir} -type f -exec sed -i 's/^#!\/usr\/local\/bin\/ruby/#!\/usr\/bin\/ruby/g' {} \;
 chmod +x %{buildroot}%{geminstdir}/lib/thin/controllers/service.sh.erb
-rm -f %{buildroot}/spec/request/processing_spec.rb
 rm -rf %{buildroot}%{geminstdir}/{ext,tmp}/ 
 rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths} 
 
@@ -84,7 +83,21 @@ rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths}
 exit 0
 %endif
 pushd ./%{geminstdir}
-rake spec2 --trace
+SPECS=
+RUBYOPT="rubygems I%{buildroot}%{geminstdir}/lib Ispec Ibenchmark_unit" spec -b `echo "
+require 'rubygems'
+require 'rake'
+PERF_SPECS = FileList['spec/perf/*_spec.rb'] + [ 'spec/server/pipelining_spec.rb' ]
+WIN_SPECS = %w(
+spec/backends/unix_server_spec.rb
+spec/controllers/service_spec.rb
+spec/daemonizing_spec.rb
+spec/server/unix_socket_spec.rb
+spec/server/swiftiply_spec.rb
+)
+SPECS2     = %w(spec/server/threaded_spec.rb spec/server/tcp_spec.rb)  
+puts FileList['spec/**/*_spec.rb'] - PERF_SPECS - WIN_SPECS - SPECS2
+" | ruby`
 popd
 
 %clean


More information about the scm-commits mailing list