Skip to content

Commit

Permalink
Updates to make "make check" a little less verbose in the
Browse files Browse the repository at this point in the history
everything-passed case.
  • Loading branch information
gvansickle committed Oct 22, 2016
1 parent 33f05c1 commit dc674aa
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
24 changes: 14 additions & 10 deletions tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -138,20 +138,24 @@ clean-local:

check-local: atconfig atlocal $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) ; RETVAL=$$? ; \
LOGS=$$(find $(builddir)/testsuite.dir -iname 'testsuite.log'); \
for FN in $$LOGS; do \
echo $$FN; \
cat $$FN; \
done; \
if test $$RETVAL != 0; then \
LOGS=$$(find $(builddir)/testsuite.dir -iname 'testsuite.log'); \
for FN in $$LOGS; do \
echo $$FN; \
cat $$FN; \
done; \
fi; \
exit $$RETVAL;

installcheck-local: atconfig atlocal $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) AUTOTEST_PATH='$(bindir)' ; RETVAL=$$? ; \
LOGS=$$(find $(builddir)/testsuite.dir -iname 'testsuite.log'); \
for FN in $$LOGS; do \
echo $$FN; \
cat $$FN; \
done; \
if test $$RETVAL != 0; then \
LOGS=$$(find $(builddir)/testsuite.dir -iname 'testsuite.log'); \
for FN in $$LOGS; do \
echo $$FN; \
cat $$FN; \
done; \
fi; \
exit $$RETVAL;


Expand Down
4 changes: 2 additions & 2 deletions tests/gen_test_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def generate_tests_type_2(self, opts=None, output_table_name=None):
select_opts = ""
select_opts += "coalesce(o.opt_expansion, '') "
for opt in opts:
print("opt: " + opt)
#print("opt: " + opt)
(opt_id, opt_val) = self.parse_opt(opt)
select_opts += """|| " " || coalesce(p.opt_""" + opt_id + """, '')"""
if opt_val:
Expand Down Expand Up @@ -227,7 +227,7 @@ def GenerateTestScript(self, test_case_id, test_output_filename, options=None, f
"""
# Query the db.
self.generate_tests_type_2(options, "benchmark1")
self.PrintTable("benchmark1")
#self.PrintTable("benchmark1")

test_cases = ""
test_inst_num=0
Expand Down

0 comments on commit dc674aa

Please sign in to comment.