summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPhilip Chimento <philip@endlessm.com>2013-11-27 19:24:22 -0800
committerPhilip Chimento <philip@endlessm.com>2013-11-27 19:24:22 -0800
commitdde829bd1c4173ad469bae0bd90f2bcad4e88f75 (patch)
tree0624164ad4db246bdf0d60b3a1d42be404e4fcab /test
parent4a17d71d4f58ca2fbad31179f280f8894780a1dc (diff)
Revert "Disable intermittent tests"
This reverts commit a8848c6c4461ef25211c9dea6e5c65029c6f91da.
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am10
1 files changed, 3 insertions, 7 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index c2f68a7..dc8b662 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -33,23 +33,19 @@ test_flexy_grid_LDADD = $(TEST_LIBS)
javascript_tests = \
test/tools/eos-run-test/sanitycheck.js \
+ test/webhelper/testTranslate.js \
+ test/webhelper/testWebActions.js \
test/wikipedia/models/testCategoryModel.js \
test/wikipedia/models/testArticleModel.js \
test/wikipedia/models/testDomainWikiModel.js \
$(NULL)
-# Disabled until post Echo release:
-# test/webhelper/testTranslate.js
-# test/webhelper/testWebActions.js
-
EXTRA_DIST += $(javascript_tests)
# Run tests when running 'make check'
TESTS = \
+ test/run-tests \
$(javascript_tests) \
$(NULL)
-# Disabled until post Echo release:
-# test/run-tests
-
TEST_EXTENSIONS = .js
JS_LOG_COMPILER = tools/eos-run-test
AM_JS_LOG_FLAGS = \