From ae611e5203da35bb546afdcc249995dff54229a3 Mon Sep 17 00:00:00 2001 From: James Campos Date: Wed, 18 Jan 2012 23:51:45 -0800 Subject: [PATCH 1/2] fix #1090 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c9de61c1c..0451f60a5 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ PDF_JS_FILES = \ # This target starts a local web server at localhost:8888. This can be # used for testing all browsers. server: - @cd test; python test.py --port=8888; + @cd test; python2 test.py --port=8888; # make test # @@ -106,7 +106,7 @@ browser-test: fi; cd test; \ - python test.py --reftest \ + python2 test.py --reftest \ --browserManifestFile=$(PDF_BROWSERS) \ --manifestFile=$(PDF_TESTS) From 92bac0547de247b0d37c52552f9aab7b3e62c5cc Mon Sep 17 00:00:00 2001 From: James Campos Date: Sat, 21 Jan 2012 23:13:20 -0800 Subject: [PATCH 2/2] DEFAULT_PYTHON, python2 -> python2.7 --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 681d82601..34a7930a3 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ BUILD_DIR := build BUILD_TARGET := $(BUILD_DIR)/pdf.js DEFAULT_BROWSERS := resources/browser_manifests/browser_manifest.json DEFAULT_TESTS := test_manifest.json +DEFAULT_PYTHON := python2.7 EXTENSION_SRC := ./extensions/ EXTENSION_BASE_VERSION := 4bb289ec499013de66eb421737a4dbb4a9273eda @@ -44,7 +45,7 @@ PDF_JS_FILES = \ # This target starts a local web server at localhost:8888. This can be # used for testing all browsers. server: - @cd test; python2 test.py --port=8888; + @cd test; $(DEFAULT_PYTHON) test.py --port=8888; # make test # @@ -107,7 +108,7 @@ browser-test: fi; cd test; \ - python2 test.py --reftest \ + $(DEFAULT_PYTHON) test.py --reftest \ --browserManifestFile=$(PDF_BROWSERS) \ --manifestFile=$(PDF_TESTS)