From 9624f6fac36ff0bd98db450b1a043dd9d978b4a9 Mon Sep 17 00:00:00 2001 From: Aurimas Vinckevicius Date: Tue, 24 Mar 2015 01:58:43 -0500 Subject: [PATCH] Fix runtests.sh to work with cygwin --- test/runtests.sh | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/test/runtests.sh b/test/runtests.sh index 7ef72c07c..90f831001 100755 --- 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 < "$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