www

commit 9ee4bbff0dac92812add2dfc37fa479057374308
parent d1ca5e272940b24804bb8fa3e70a6359b82dc3ec
Author: Simon Kornblith <simon@simonster.com>
Date:   Tue, 24 Mar 2015 09:11:30 -0400

Merge pull request #682 from aurimasv/cygwin-unit_tests

Fix runtests.sh to work with cygwin
Diffstat:
M
test/runtests.sh
 | 
25
++++++++++++++++++++++---

1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/test/runtests.sh b/test/runtests.sh
@@ -1,6 +1,19 @@
 #!/bin/bash
 CWD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+case "$(uname -s)" in
+   CYGWIN*) IS_CYGWIN=1 ;;
+esac
+
+function makePath {
+	local __assignTo=$1
+	local __path=$2
+	if [ ! -z $IS_CYGWIN ]; then
+		__path="`cygpath -aw \"$__path\"`"
+	fi
+	eval $__assignTo="'$__path'"
+}
+
 DEBUG=false
 if [ "`uname`" == "Darwin" ]; then
 	FX_EXECUTABLE="/Applications/Firefox.app/Contents/MacOS/firefox"
@@ -50,8 +63,13 @@ fi
 # Set up profile directory
 PROFILE="`mktemp -d 2>/dev/null || mktemp -d -t 'zotero-unit'`"
 mkdir "$PROFILE/extensions"
-echo "$CWD" > "$PROFILE/extensions/zotero-unit@zotero.org"
-echo "`dirname "$CWD"`" > "$PROFILE/extensions/zotero@chnm.gmu.edu"
+
+makePath ZOTERO_UNIT_PATH "$CWD"
+echo "$ZOTERO_UNIT_PATH" > "$PROFILE/extensions/zotero-unit@zotero.org"
+
+makePath ZOTERO_PATH "`dirname "$CWD"`"
+echo "$ZOTERO_PATH" > "$PROFILE/extensions/zotero@chnm.gmu.edu"
+
 cat <<EOF > "$PROFILE/prefs.js"
 user_pref("extensions.autoDisableScopes", 0);
 user_pref("extensions.zotero.debug.log", $DEBUG);
@@ -59,7 +77,8 @@ user_pref("extensions.zotero.firstRunGuidance", false);
 user_pref("extensions.zotero.firstRun2", false);
 EOF
 
-MOZ_NO_REMOTE=1 NO_EM_RESTART=1 "$FX_EXECUTABLE" -profile "$PROFILE" \
+makePath FX_PROFILE "$PROFILE"
+MOZ_NO_REMOTE=1 NO_EM_RESTART=1 "$FX_EXECUTABLE" -profile "$FX_PROFILE" \
     -chrome chrome://zotero-unit/content/runtests.html -test "$TESTS" $FX_ARGS
 
 # Check for success