Testing: looking for a way to run pylmm

1 files changed, 15 insertions, 8 deletions

diff --git a/bin/test-website b/bin/test-website
index 2e91f364..18994cc5 100755
--- a/bin/test-website
+++ b/bin/test-website
@@ -2,8 +2,8 @@
 
 
 USAGE = <<EOT
-This is Mechanical-Rob - an automated web server tester for 
-                         Genenetwork.org that uses the brilliant 
+This is Mechanical-Rob - an automated web server tester for
+                         Genenetwork.org that uses the brilliant
                          mechanize gem.
 
 To use this software you need to install mechanize. Run it from
@@ -16,7 +16,7 @@ If you are using the small deployment database you can use
   ./bin/test-website --skip -n
 
 For more information see http://genenetwork.org/
-                        
+
 EOT
 $stderr.print USAGE
 
@@ -25,7 +25,7 @@ require 'optparse'
 options = { database: :small, link_checker: false}
 opts = OptionParser.new do |o|
   o.banner = "Usage: #{File.basename($0)} [options] URL"
-  
+
   o.on('-d','--database', String, 'Use database (default db_webqtl_s)') do |s|
     options[:database] =
       case s
@@ -39,11 +39,15 @@ opts = OptionParser.new do |o|
   o.on('-l','--link-checker', 'Check for dead links') do
     options[:link_checker] = true
   end
-  
-  o.on('-n','--navigation-test', 'Check for navigation test results') do
+
+  o.on('--navigation-test', 'Check for navigation') do
     options[:navigation_test] = true
   end
 
+  o.on('--mapping-test', 'Check for mapping') do
+    options[:mapping_test] = true
+  end
+
   o.on('--skip-broken', 'Skip tests that are known to be broken') do
     options[:skip_broken] = true
   end
@@ -62,7 +66,7 @@ if options[:show_help]
 end
 
 $options = options  # we are using a global here
-$host = 
+$host =
   if ARGV.size>0
     ARGV.shift
   else
@@ -85,8 +89,11 @@ if options[:link_checker]
 else
   require 'main_web_functionality'
 end
-  
+
 if options[:navigation_test]
   require 'navigation'
 end
 
+if options[:mapping_test]
+  require 'mapping'
+end