From be2e7a7a9cd9a85e180cc401713ed3f3e1667f84 Mon Sep 17 00:00:00 2001 From: Kalervo Kujala Date: Thu, 15 Dec 2011 00:51:10 +0200 Subject: [PATCH] Add profile handling for the unit test. --- test/unit/Makefile | 29 ++++++++++++++++++++++++----- test/unit/test_reports/.gitignore | 1 + 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/test/unit/Makefile b/test/unit/Makefile index 19a072481..4f2e06afb 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -1,13 +1,31 @@ +# Create temporary profile directory name. +TEMP_PROFILE_DIR:=$(shell echo ./test_reports/temp`date +"%Y%m%d%H%M%S"profile`) + +# These are the Firefox command line arguments. +FIREFOX_ARGS:=-no-remote -profile $(TEMP_PROFILE_DIR) + +# These are the Chrome command line arguments. +CHROME_ARGS:=--user-data-dir=$(TEMP_PROFILE_DIR) --no-first-run --disable-sync + +# Unit test uses the manifest from ref test to determine which browsers will +# be used for running the unit tests. +MANIFEST:=../resources/browser_manifests/browser_manifest.json + # Fetch the paths to browsers that are going to be used in testing. -MANIFEST=../resources/browser_manifests/browser_manifest.json -BROWSERS=$(shell echo `sed -n 's/.*"path":\(.*\)/\1,/p' $(MANIFEST) | tr -d '\n' | \ +# For OS X the path to the binary needs to be added. Also the browser +# arguments are added for each of the browser. +BROWSERS:=$(shell echo `\ + sed -n 's/.*"path":\(.*\)/\1,/p' $(MANIFEST) | \ + tr -d '\n' | \ sed 's/\(Google Chrome\.app\)/\1\/Contents\/MacOS\/Google Chrome/' | \ sed 's/\(Aurora\.app\)/\1\/Contents\/MacOS\/firefox-bin/' | \ - sed 's/\(Firefox[ Beta]*\.app\)/\1\/Contents\/MacOS\/firefox-bin/' \ + sed 's/\(Firefox[ Beta]*\.app\)/\1\/Contents\/MacOS\/firefox-bin/' | \ + sed "s|\(irefox[.exe\-bin]*\)\"|\1;$(FIREFOX_ARGS)\"|g" | \ + sed "s|\(hrome*\)\"|\1;$(CHROME_ARGS)\"|g" \ `) -# Command to invoke the unit test. -PROG=java \ +# This is the command to invoke the unit test. +PROG:=java \ -Xms512m \ -Xmx1024m \ -jar ../../external/jsTestDriver/JsTestDriver-1.3.3d.jar \ @@ -20,6 +38,7 @@ PROG=java \ test: $(PROG) + @rm -rf $(TEMP_PROFILE_DIR) .phony:: test diff --git a/test/unit/test_reports/.gitignore b/test/unit/test_reports/.gitignore index 598ac101e..7193eb3d2 100644 --- a/test/unit/test_reports/.gitignore +++ b/test/unit/test_reports/.gitignore @@ -1,2 +1,3 @@ TEST* +temp*