From ad726c0171214fc349506ba861a99d3effe27969 Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Mon, 11 Dec 2017 11:31:45 -0800 Subject: [PATCH 1/2] Use Homebrew to install multiple languages --- .travis.yml | 28 ++++++++++++---------------- tests/build_test.py | 16 ++++++++-------- tests/languages/python_server.py | 3 ++- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5b48a0..afe1ee1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,12 @@ -matrix: - before_install: - # Taken from https://github.com/travis-ci/travis-ci/issues/2478 - - sudo apt-get update -qq - - sudo apt-get install libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev - - wget http://www.us.apache.org/dist/thrift/0.9.1/thrift-0.9.1.tar.gz - - tar xfz thrift-0.9.1.tar.gz - - cd thrift-0.9.1 && ./configure && sudo make install - include: - # - language: cpp - # - language: csharp - # - language: java - - language: python - script: - - python tests/build_test.py - # - python3 tests/test_py.py +os: osx + +before_install: + - brew install thrift + # - brew install (c++) + # - brew install (mcs) + # - brew install python + +language: java + +script: + - python tests/build_test.py diff --git a/tests/build_test.py b/tests/build_test.py index db7c884..fae8194 100644 --- a/tests/build_test.py +++ b/tests/build_test.py @@ -35,7 +35,7 @@ class BuildTester(unittest.TestCase): # self.assertEqual(os.system('c++ -std=c++11 %s/tests/languages/cpp_server.cpp' % DIRECTORY), 0) # self.assertEqual(os.system(remove_generated_files(CPP)), 0) # self.assertEqual(os.system('rm a.out'), 0) - # + # def test_csharp(self): # self.assertEqual(os.system(generate_files(CSHARP)), 0) # self.assertEqual(os.system('mcs /warnaserror /t:library /out:generated.dll /reference:thrift.dll %s/thrift/gen-csharp/example/*.cs' % DIRECTORY), 0) @@ -44,16 +44,16 @@ class BuildTester(unittest.TestCase): # self.assertEqual(os.system('rm %s/tests/languages/CsharpServer/CsharpServer.exe' % DIRECTORY), 0) # self.assertEqual(os.system('rm thrift.dll'), 0) # self.assertEqual(os.system('rm generated.dll'), 0) - # - # def test_java(self): - # self.assertEqual(os.system(generate_files(JAVA)), 0) - # self.assertEqual(os.system('javac %s/languages/JavaServer.java' % DIRECTORY), 0) - # self.assertEqual(os.system(remove_generated_files(JAVA)), 0) - # self.assertEqual(os.system('rm %s/languages/JavaServer.class' % DIRECTORY), 0) + + def test_java(self): + self.assertEqual(os.system(generate_files(JAVA)), 0) + self.assertEqual(os.system('javac %s/tests/languages/JavaServer.java' % DIRECTORY), 0) + self.assertEqual(os.system(remove_generated_files(JAVA)), 0) + self.assertEqual(os.system('rm %s/tests/languages/JavaServer.class' % DIRECTORY), 0) def test_python(self): self.assertEqual(os.system(generate_files(PYTHON)), 0) - self.assertEqual(os.system('python3 %s/languages/python_server.py' % DIRECTORY), 0) + self.assertEqual(os.system('python3 %s/tests/languages/python_server.py' % DIRECTORY), 0) self.assertEqual(os.system(remove_generated_files(PYTHON)), 0) if __name__ == '__main__': diff --git a/tests/languages/python_server.py b/tests/languages/python_server.py index e014019..0bdb894 100644 --- a/tests/languages/python_server.py +++ b/tests/languages/python_server.py @@ -1,5 +1,6 @@ import sys -sys.path.insert(0, '../thrift/gen-py') +DIRECTORY = subprocess.check_output('git rev-parse --show-toplevel'.split()).strip() +sys.path.insert(0, '%s/thrift/gen-py' % DIRECTORY) import Tools.ttypes; import ProcessorService.Processor; From a510e2218f01f072426378d14f0493052d7fa253 Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Tue, 2 Jan 2018 09:26:47 -0800 Subject: [PATCH 2/2] Make travis.yml apply to only Python --- .travis.yml | 8 ++++---- tests/build_test.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index afe1ee1..bea9472 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,11 @@ os: osx before_install: - brew install thrift - # - brew install (c++) - # - brew install (mcs) - # - brew install python -language: java +language: python + +python: + "3.6" script: - python tests/build_test.py diff --git a/tests/build_test.py b/tests/build_test.py index fae8194..900110e 100644 --- a/tests/build_test.py +++ b/tests/build_test.py @@ -45,11 +45,11 @@ class BuildTester(unittest.TestCase): # self.assertEqual(os.system('rm thrift.dll'), 0) # self.assertEqual(os.system('rm generated.dll'), 0) - def test_java(self): - self.assertEqual(os.system(generate_files(JAVA)), 0) - self.assertEqual(os.system('javac %s/tests/languages/JavaServer.java' % DIRECTORY), 0) - self.assertEqual(os.system(remove_generated_files(JAVA)), 0) - self.assertEqual(os.system('rm %s/tests/languages/JavaServer.class' % DIRECTORY), 0) + # def test_java(self): + # self.assertEqual(os.system(generate_files(JAVA)), 0) + # self.assertEqual(os.system('javac %s/tests/languages/JavaServer.java' % DIRECTORY), 0) + # self.assertEqual(os.system(remove_generated_files(JAVA)), 0) + # self.assertEqual(os.system('rm %s/tests/languages/JavaServer.class' % DIRECTORY), 0) def test_python(self): self.assertEqual(os.system(generate_files(PYTHON)), 0)