Merge pull request #770 from hexid/travis-dotNET-add-jshint-clitest

Run cli tests and jshint with the dotNET travis jobs

-.PHONY: default test test-dotNET docs selftest compile-dotNET selftest-dotNET clitest jshint
+.PHONY: default test test-dotNET docs selftest compile-dotNET selftest-dotNET clitest clitest-dotNET jshint
 
 
 default: test
 default: test
 
 
 test: selftest clitest jshint
 test: selftest clitest jshint
 
 
-test-dotNET: compile-dotNET selftest-dotNET
+test-dotNET: compile-dotNET selftest-dotNET clitest-dotNET jshint
 
 
 docs:
 docs:
 	sphinx-build -b html ./docs docs/_build
 	sphinx-build -b html ./docs docs/_build
@@ -21,5 +21,8 @@ selftest-dotNET:
 clitest:
 clitest:
 	python tests/clitests/runtests.py
 	python tests/clitests/runtests.py
 
 
+clitest-dotNET:
+	python tests/clitests/runtests.py casperjs.exe
+
 jshint:
 jshint:
 	jshint .
 	jshint .

@@ -5,10 +5,12 @@ import os
 import signal
 import signal
 import subprocess
 import subprocess
 import unittest
 import unittest
+import sys
 
 
 TEST_ROOT = os.path.abspath(os.path.dirname(__file__))
 TEST_ROOT = os.path.abspath(os.path.dirname(__file__))
 CASPERJS_ROOT = os.path.abspath(os.path.join(TEST_ROOT, '..', '..'))
 CASPERJS_ROOT = os.path.abspath(os.path.join(TEST_ROOT, '..', '..'))
-CASPER_EXEC = os.path.join(CASPERJS_ROOT, 'bin', 'casperjs')
+CASPER_EXEC_FILE = sys.argv[1] if (len(sys.argv) == 2) else 'casperjs'
+CASPER_EXEC = os.path.join(CASPERJS_ROOT, 'bin', CASPER_EXEC_FILE)
 ENGINE_EXEC = os.environ.get('ENGINE_EXECUTABLE',
 ENGINE_EXEC = os.environ.get('ENGINE_EXECUTABLE',
                              os.environ.get('PHANTOMJS_EXECUTABLE',
                              os.environ.get('PHANTOMJS_EXECUTABLE',
                                             "phantomjs"))
                                             "phantomjs"))
@@ -434,4 +436,5 @@ class XUnitReportTest(CasperExecTestBase):
         self.assertTrue(os.path.exists(self.XUNIT_LOG))
         self.assertTrue(os.path.exists(self.XUNIT_LOG))
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
+    del sys.argv[1:]
     unittest.main()
     unittest.main()