From 06952c77613298dc065653665a86cb7869750cdc Mon Sep 17 00:00:00 2001
From: Thomas Levine <_@thomaslevine.com>
Date: Sun, 28 Feb 2016 22:36:45 +0000
Subject: [PATCH] work on setup teardown

---
 ...r directory, and the others should be run once per file. | 2 +-
 urchin                                                      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Setup and Teardown/_dir files should be run once per directory, and the others should be run once per file. b/tests/Setup and Teardown/_dir files should be run once per directory, and the others should be run once per file.
index da79d79..dd46680 100755
--- a/tests/Setup and Teardown/_dir files should be run once per directory, and the others should be run once per file.	
+++ b/tests/Setup and Teardown/_dir files should be run once per directory, and the others should be run once per file.	
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$TEST_SHELL ../../urchin --run-in-series .test
+../../urchin --disable-cycling --run-in-series .test
diff --git a/urchin b/urchin
index 17be33c..35957bf 100755
--- a/urchin
+++ b/urchin
@@ -422,8 +422,8 @@ do
     case "$1" in
         -b|--run-in-series) run_in_series=true;;
         -e|--exit-on-fail) exit_on_not_ok=true;;
-        -f) force=true;;
-        -s)
+        -f|--force) force=true;;
+        -s|--shell)
           shift
           shell_for_sh_tests=$1
          
@@ -441,7 +441,7 @@ you don't need to quote the TEST_SHELL variable." > /dev/stderr
 
           echo "$shell_for_sh_tests" >> "$shell_list"
           ;;
-        -n) cycle_shell=false;; 
+        -n|--disable-cycling) cycle_shell=false;; 
         -t|--tap) tap_format=true;;
         -h|--help) urchin_help
           exit 0;;