diff --git a/make.js b/make.js index ff4c151f0..acf60e412 100644 --- a/make.js +++ b/make.js @@ -1101,7 +1101,7 @@ target.chromium = function() { if (!test('-f', browserManifest)) { echo('Browser manifest file ' + browserManifest + ' does not exist.'); - echo('Try copying one of the examples in test/resources/browser_manifests'); + echo('Copy and adjust the example in test/resources/browser_manifests.'); exit(1); } @@ -1189,7 +1189,7 @@ target.browsertest = function(options) { if (!test('-f', 'test/' + PDF_BROWSERS)) { echo('Browser manifest file test/' + PDF_BROWSERS + ' does not exist.'); - echo('Copy one of the examples in test/resources/browser_manifests/'); + echo('Copy and adjust the example in test/resources/browser_manifests.'); exit(1); } @@ -1213,7 +1213,7 @@ target.unittest = function(options, callback) { if (!test('-f', 'test/' + PDF_BROWSERS)) { echo('Browser manifest file test/' + PDF_BROWSERS + ' does not exist.'); - echo('Copy one of the examples in test/resources/browser_manifests/'); + echo('Copy and adjust the example in test/resources/browser_manifests.'); exit(1); } callback = callback || function() {}; @@ -1235,7 +1235,7 @@ target.fonttest = function(options, callback) { if (!test('-f', 'test/' + PDF_BROWSERS)) { echo('Browser manifest file test/' + PDF_BROWSERS + ' does not exist.'); - echo('Copy one of the examples in test/resources/browser_manifests/'); + echo('Copy and adjust the example in test/resources/browser_manifests.'); exit(1); } callback = callback || function() {}; @@ -1258,7 +1258,7 @@ target.botmakeref = function() { if (!test('-f', 'test/' + PDF_BROWSERS)) { echo('Browser manifest file test/' + PDF_BROWSERS + ' does not exist.'); - echo('Copy one of the examples in test/resources/browser_manifests/'); + echo('Copy and adjust the example in test/resources/browser_manifests.'); exit(1); } diff --git a/test/resources/browser_manifests/browser_manifest.json.example b/test/resources/browser_manifests/browser_manifest.json.example new file mode 100644 index 000000000..6482a03e8 --- /dev/null +++ b/test/resources/browser_manifests/browser_manifest.json.example @@ -0,0 +1,10 @@ +[ + { + "name": "Firefox", + "path": "/path/to/firefox/executable" + }, + { + "name": "Chrome", + "path": "/path/to/chrome/executable" + } +] diff --git a/test/resources/browser_manifests/browser_manifest.json.linux b/test/resources/browser_manifests/browser_manifest.json.linux deleted file mode 100644 index a576899b5..000000000 --- a/test/resources/browser_manifests/browser_manifest.json.linux +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "name":"firefox7", - "path":"/home/sayrer/firefoxen/nightly/firefox" - }, - { - "name":"chrome14", - "path":"/opt/google/chrome/chrome" - } -] diff --git a/test/resources/browser_manifests/browser_manifest.json.mac b/test/resources/browser_manifests/browser_manifest.json.mac deleted file mode 100644 index 3bb0143f3..000000000 --- a/test/resources/browser_manifests/browser_manifest.json.mac +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "name":"firefox5", - "path":"/Applications/Firefox.app" - }, - { - "name":"firefox6", - "path":"/Applications/FirefoxAurora.app" - }, - { - "name":"chrome14", - "path":"/Applications/Google Chrome.app" - } -] diff --git a/test/resources/browser_manifests/browser_manifest.json.windows b/test/resources/browser_manifests/browser_manifest.json.windows deleted file mode 100644 index a19727b05..000000000 --- a/test/resources/browser_manifests/browser_manifest.json.windows +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "name":"firefox", - "path":"C:/Program Files (x86)/Firefox/firefox.exe" - }, - { - "name":"aurora", - "path":"C:/Program Files (x86)/Aurora/firefox.exe" - } -]