1 files changed, 12 insertions, 4 deletions
diff --git a/src/ruby/Rakefile b/src/ruby/Rakefile
index 6ba9a97c89..5fc325ef0e 100755
--- a/src/ruby/Rakefile
+++ b/src/ruby/Rakefile
@@ -13,9 +13,11 @@ end
 SPEC_SUITES = [
   { id: :wrapper, title: 'wrapper layer', files: %w(spec/*.rb) },
   { id: :idiomatic, title: 'idiomatic layer', dir: %w(spec/generic),
-    tag: '~bidi' },
+    tags: ['~bidi', '~server'] },
   { id: :bidi, title: 'bidi tests', dir: %w(spec/generic),
-    tag: 'bidi' }
+    tag: 'bidi' },
+  { id: :server, title: 'rpc server thread tests', dir: %w(spec/generic),
+    tag: 'server' }
 ]
 
 desc 'Run all RSpec tests'
@@ -33,12 +35,18 @@ namespace :spec do
 
         t.pattern = spec_files
         t.rspec_opts = "--tag #{suite[:tag]}" if suite[:tag]
+        t.rspec_opts = suite[:tags].map{ |t| "--tag #{t}" }.join(' ') if suite[:tags]
       end
     end
   end
 end
 
-task default: 'spec:suite:idiomatic'  # this should be spec:suite:bidi
+desc 'Run compiles the extension, runs all the tests'
+task :all
+
+task default: :all
 task 'spec:suite:wrapper' => :compile
 task 'spec:suite:idiomatic' => 'spec:suite:wrapper'
-task 'spec:suite:bidi' => 'spec:suite:idiomatic'
+task 'spec:suite:bidi' => 'spec:suite:wrapper'
+task 'spec:suite:server' => 'spec:suite:wrapper'
+task :all => ['spec:suite:idiomatic', 'spec:suite:bidi', 'spec:suite:server']