Skip to content

John McEleney / casperjs

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 2124a252 2124a252fafe9144afed37faa32f697c4e251f78 by hexid
Options

Run cli tests and jshint with the dotNET travis jobs

1 parent 16d6e2b7
Inline Side-by-side
Showing 2 changed files with 9 additions and 3 deletions
1 .PHONY: default test test-dotNET docs selftest compile-dotNET selftest-dotNET clitest jshint 1 .PHONY: default test test-dotNET docs selftest compile-dotNET selftest-dotNET clitest clitest-dotNET jshint
2 2
3 default: test 3 default: test
4 4
5 test: selftest clitest jshint 5 test: selftest clitest jshint
6 6
7 test-dotNET: compile-dotNET selftest-dotNET 7 test-dotNET: compile-dotNET selftest-dotNET jshint clitest-dotNET
8 8
9 docs: 9 docs:
10 sphinx-build -b html ./docs docs/_build 10 sphinx-build -b html ./docs docs/_build
...@@ -21,5 +21,8 @@ selftest-dotNET: ...@@ -21,5 +21,8 @@ selftest-dotNET:
21 clitest: 21 clitest:
22 python tests/clitests/runtests.py 22 python tests/clitests/runtests.py
23 23
24 clitest-dotNET:
25 python tests/clitests/runtests.py casperjs.exe
26
24 jshint: 27 jshint:
25 jshint . 28 jshint .
......
...@@ -5,10 +5,12 @@ import os ...@@ -5,10 +5,12 @@ import os
5 import signal 5 import signal
6 import subprocess 6 import subprocess
7 import unittest 7 import unittest
8 import sys
8 9
9 TEST_ROOT = os.path.abspath(os.path.dirname(__file__)) 10 TEST_ROOT = os.path.abspath(os.path.dirname(__file__))
10 CASPERJS_ROOT = os.path.abspath(os.path.join(TEST_ROOT, '..', '..')) 11 CASPERJS_ROOT = os.path.abspath(os.path.join(TEST_ROOT, '..', '..'))
11 CASPER_EXEC = os.path.join(CASPERJS_ROOT, 'bin', 'casperjs') 12 CASPER_EXEC_FILE = sys.argv[1] if (len(sys.argv) == 2) else 'casperjs'
13 CASPER_EXEC = os.path.join(CASPERJS_ROOT, 'bin', CASPER_EXEC_FILE)
12 ENGINE_EXEC = os.environ.get('ENGINE_EXECUTABLE', 14 ENGINE_EXEC = os.environ.get('ENGINE_EXECUTABLE',
13 os.environ.get('PHANTOMJS_EXECUTABLE', 15 os.environ.get('PHANTOMJS_EXECUTABLE',
14 "phantomjs")) 16 "phantomjs"))
...@@ -434,4 +436,5 @@ class XUnitReportTest(CasperExecTestBase): ...@@ -434,4 +436,5 @@ class XUnitReportTest(CasperExecTestBase):
434 self.assertTrue(os.path.exists(self.XUNIT_LOG)) 436 self.assertTrue(os.path.exists(self.XUNIT_LOG))
435 437
436 if __name__ == '__main__': 438 if __name__ == '__main__':
439 del sys.argv[1:]
437 unittest.main() 440 unittest.main()
......