diff options
| author |  Rogan Creswick <creswick@gmail.com> | 2013-06-11 14:25:33 -0700 |
|---|---|---|
| committer | Rogan Creswick <creswick@gmail.com> | 2013-06-11 14:25:33 -0700 |
| commit | 13d128f443d3b8e282da276fd1b96415d52df0d3 (patch) | |
| tree | 04a7242563fc10071e4412776734616ab745346e | |
| parent | 837d26deeb5556a167633534b5c84aa9aa9ed33d (diff) | |
| parent | 2f432d2b309b0896a309b727c6e95e5cf91b2ea4 (diff) | |
Merge branch 'master' of src.galois.com:/srv/git/FiveUI
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/batchtools/build.mk | 2 | ||||
| -rwxr-xr-x | src/batchtools/headless/bin/runHeadless.sh | 4 | ||||
| -rw-r--r-- | src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js | 6 | ||||
| -rw-r--r-- | src/js/firefox/build.mk | 4 |
5 files changed, 8 insertions, 10 deletions
@@ -37,7 +37,7 @@ clean:: distclean:: clean .PHONY: test -test: package +test: # Utilities #################################################################### diff --git a/src/batchtools/build.mk b/src/batchtools/build.mk index 26980e4..1b71531 100644 --- a/src/batchtools/build.mk +++ b/src/batchtools/build.mk @@ -9,9 +9,7 @@ test: test-batchtools .PHONY: test-batchtools test-batchtools: \ - $(build-dir)/fiveui.crx \ $(build-dir)/fiveui.xpi \ - $(topdir)/profiles/chrome \ $(topdir)/profiles/firefox $(call label,BATCHTEST)(cd $(batchtools-dir) \ && xvfb-run -a $(maven-cmd) test -DFIREFOX_BIN_PATH=$(firefox_bin_path)) diff --git a/src/batchtools/headless/bin/runHeadless.sh b/src/batchtools/headless/bin/runHeadless.sh index 4c4d863..29a0419 100755 --- a/src/batchtools/headless/bin/runHeadless.sh +++ b/src/batchtools/headless/bin/runHeadless.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -export FIVEUI_ROOT_PATH=$HOME/FiveUI +export FIVEUI_ROOT_PATH=$HOME/galois/FiveUI export FIREFOX_BIN_PATH=/Users/bjones/myapps/Firefox_17_esr.app/Contents/MacOS/firefox java -DFIVEUI_ROOT_PATH=$FIVEUI_ROOT_PATH \ -DFIREFOX_BIN_PATH=$FIREFOX_BIN_PATH \ - -jar $FIVEUI_ROOT_PATH/headless/bin/HeadlessRunner-0.0.1-SNAPSHOT.one-jar.jar \ + -jar $FIVEUI_ROOT_PATH/src/batchtools/headless/bin/HeadlessRunner-0.0.1-SNAPSHOT.one-jar.jar \ $* diff --git a/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js index f6c1cb6..8c41123 100644 --- a/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js +++ b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js @@ -8,12 +8,12 @@ exports.rule = function() { function(idx) { var ch = $(this).text()[0]; if (ch) { - return (ch == ch.toLowerCase() ); + return (ch == ch.toLowerCase()); } else { return false; } }); - $(badHeadings).map(function(idx, elt){ - report('Heading does not start with a capitol letter.', elt); + $(badHeadings).map(function(idx, elt) { + report('Heading does not start with a capital letter.', elt); }); }; diff --git a/src/js/firefox/build.mk b/src/js/firefox/build.mk index 9f1caa8..1807a45 100644 --- a/src/js/firefox/build.mk +++ b/src/js/firefox/build.mk @@ -3,7 +3,7 @@ all: stage-firefox -package: $(build-dir)/firefox.xpi +package: $(build-dir)/fiveui.xpi firefox-dir := $(path) @@ -85,7 +85,7 @@ stage-firefox: \ $(firefox-build)/data/icons/options-icon.js \ | $(firefox-build) -$(build-dir)/firefox.xpi: \ +$(build-dir)/fiveui.xpi: \ stage-firefox \ $(addon-sdk-unpacked) \ $(topdir)/profiles/firefox |