merge from master + make test suite more flexible of q location

1 files changed, 14 insertions, 12 deletions

diff --git a/test/test-suite b/test/test-suite
index 836676c..26f91cf 100755
--- a/test/test-suite
+++ b/test/test-suite
@@ -32,8 +32,10 @@ import itertools
 # make sure that the output is correctly encoded
 SYSTEM_ENCODING = locale.getpreferredencoding()
 
+Q_EXECUTABLE = os.environ.get('Q_EXECUTABLE','../bin/q')
+
+DEBUG = 'Q_TEST_DEBUG' in os.environ
 
-DEBUG = False
 if len(sys.argv) > 2 and sys.argv[2] == '-v':
     DEBUG = True
 
@@ -163,7 +165,7 @@ class SaveDbToDiskTests(AbstractQTestCase):
         db_filename = self.random_tmp_filename('store-to-disk','db')
         self.assertFalse(os.path.exists(db_filename))
 
-        retcode, o, e = run_command('seq 1 1000 | ../bin/q "select count(*) from -" -c 1 -S %s' % db_filename)
+        retcode, o, e = run_command('seq 1 1000 | ' + Q_EXECUTABLE + ' "select count(*) from -" -c 1 -S %s' % db_filename)
 
         self.assertTrue(retcode == 0)
         self.assertTrue(len(o) == 0)
@@ -189,12 +191,12 @@ class SaveDbToDiskTests(AbstractQTestCase):
         db_filename = self.random_tmp_filename('store-to-disk', 'db')
         self.assertFalse(os.path.exists(db_filename))
 
-        retcode, o, e = run_command('seq 1 1000 | ../bin/q "select count(*) from -" -c 1 -S %s' % db_filename)
+        retcode, o, e = run_command('seq 1 1000 | ' + Q_EXECUTABLE + ' "select count(*) from -" -c 1 -S %s' % db_filename)
 
         self.assertTrue(retcode == 0)
         self.assertTrue(os.path.exists(db_filename))
 
-        retcode2, o2, e2 = run_command('seq 1 1000 | ../bin/q "select count(*) from -" -c 1 -S %s' % db_filename)
+        retcode2, o2, e2 = run_command('seq 1 1000 | ' + Q_EXECUTABLE + ' "select count(*) from -" -c 1 -S %s' % db_filename)
         self.assertTrue(retcode2 != 0)
         self.assertTrue(e2[0].startswith(six.b('Going to save data into a disk database')))
         self.assertTrue(e2[1] == six.b('Disk database file {} already exists.'.format(db_filename)))
@@ -206,7 +208,7 @@ class BasicTests(AbstractQTestCase):
 
     def test_basic_aggregation(self):
         retcode, o, e = run_command(
-            'seq 1 10 | ../bin/q "select sum(c1),avg(c1) from -"')
+            'seq 1 10 | ' + Q_EXECUTABLE + ' "select sum(c1),avg(c1) from -"')
         self.assertTrue(retcode == 0)
         self.assertTrue(len(o) == 1)
         self.assertTrue(len(e) == 1)
@@ -236,7 +238,7 @@ class BasicTests(AbstractQTestCase):
         tmpfile = self.create_file_with_data(
             six.b('\x1f\x8b\x08\x08\xf2\x18\x12S\x00\x03xxxxxx\x003\xe42\xe22\xe62\xe12\xe52\xe32\xe7\xb2\xe0\xb2\xe424\xe0\x02\x00\xeb\xbf\x8a\x13\x15\x00\x00\x00'))
 
-        cmd = 'cat %s | ../bin/q -z "select sum(c1),avg(c1) from -"' % tmpfile.name
+        cmd = 'cat %s | ' % tmpfile.name + Q_EXECUTABLE + ' -z "select sum(c1),avg(c1) from -"'
 
         retcode, o, e = run_command(cmd)
         self.assertTrue(retcode != 0)
@@ -382,7 +384,7 @@ class BasicTests(AbstractQTestCase):
         self.cleanup(tmpfile)
 
     def test_stdin_input(self):
-        cmd = six.b('printf "%s" | ../bin/q -d , "select c1,c2,c3 from -"') % sample_data_no_header
+        cmd = six.b('printf "%s" | ' + Q_EXECUTABLE + ' -d , "select c1,c2,c3 from -"') % sample_data_no_header
         retcode, o, e = run_command(cmd)
 
         self.assertEqual(retcode, 0)
@@ -1750,8 +1752,8 @@ class FormattingTests(AbstractQTestCase):
 
     def test_column_formatting(self):
         # TODO Decide if this breaking change is reasonable
-        #cmd = 'seq 1 10 | ../bin/q -f 1=%4.3f,2=%4.3f "select sum(c1),avg(c1) from -" -c 1'
-        cmd = 'seq 1 10 | ../bin/q -f 1={:4.3f},2={:4.3f} "select sum(c1),avg(c1) from -" -c 1'
+        #cmd = 'seq 1 10 | ' + Q_EXECUTABLE + ' -f 1=%4.3f,2=%4.3f "select sum(c1),avg(c1) from -" -c 1'
+        cmd = 'seq 1 10 | ' + Q_EXECUTABLE + ' -f 1={:4.3f},2={:4.3f} "select sum(c1),avg(c1) from -" -c 1'
 
         retcode, o, e = run_command(cmd)
 
@@ -1764,8 +1766,8 @@ class FormattingTests(AbstractQTestCase):
     def test_column_formatting_with_output_header(self):
         perl_regex = "'s/1\n/column_name\n1\n/;'"
         # TODO Decide if this breaking change is reasonable
-        #cmd = 'seq 1 10 | perl -pe ' + perl_regex + ' | ../bin/q -f 1=%4.3f,2=%4.3f "select sum(column_name) mysum,avg(column_name) myavg from -" -c 1 -H -O'
-        cmd = 'seq 1 10 | perl -pe ' + perl_regex + ' | ../bin/q -f 1={:4.3f},2={:4.3f} "select sum(column_name) mysum,avg(column_name) myavg from -" -c 1 -H -O'
+        #cmd = 'seq 1 10 | perl -pe ' + perl_regex + ' | ' + Q_EXECUTABLE + ' -f 1=%4.3f,2=%4.3f "select sum(column_name) mysum,avg(column_name) myavg from -" -c 1 -H -O'
+        cmd = 'seq 1 10 | perl -pe ' + perl_regex + ' | ' + Q_EXECUTABLE + ' -f 1={:4.3f},2={:4.3f} "select sum(column_name) mysum,avg(column_name) myavg from -" -c 1 -H -O'
 
         retcode, o, e = run_command(cmd)
 
@@ -2406,7 +2408,7 @@ class BenchmarkTests(AbstractQTestCase):
         ff.write('\n')
         ff.close()
 
-        r, o, e = run_command('head -{} {}/benchmark-file.csv | ../bin/q -d , "select {} from -" >> {}'.format(lines, BenchmarkTests.BENCHMARK_DIR, ','.join(c), filename))
+        r, o, e = run_command('head -{} {}/benchmark-file.csv | ' + Q_EXECUTABLE + ' -d , "select {} from -" >> {}'.format(lines, BenchmarkTests.BENCHMARK_DIR, ','.join(c), filename))
         self.assertEqual(r, 0)
         return filename