Auto merge of #905 - ebfull:test-suite-fixes, r=ebfull

Run `zcash-gtest` in `make check` and fix performance tests.

* gtest tests weren't being run by make check
* performance tests were broken
* We need to automatically upload graphs of performance, [see this PR](https://github.com/Electric-Coin-Company/bbotzc/pull/15).
* Moves zerocash tests into `zcash`'s full test suite, we're removing them anyway later and it'd be nice to remove them in the PR instead of from buildbot
This commit is contained in:
zkbot
2016-05-05 23:29:34 +00:00
4 changed files with 6 additions and 2 deletions

View File

@@ -489,6 +489,7 @@ clean-local:
if ENABLE_TESTS
include Makefile.test.include
include Makefile.gtest.include
endif
if ENABLE_QT
@@ -500,4 +501,3 @@ include Makefile.qttest.include
endif
include Makefile.zcash.include
include Makefile.gtest.include