summaryrefslogtreecommitdiff
path: root/test/Makefile.am.inc
diff options
context:
space:
mode:
authorMatt Watson <mattdangerw@gmail.com>2014-01-21 11:39:13 -0800
committerMatt Watson <mattdangerw@gmail.com>2014-01-22 13:43:05 -0800
commit8521313dbf24f1681d488c8542cb3c20c373c2c7 (patch)
treee03796356a6905761e4a4acd11af983e63455b51 /test/Makefile.am.inc
parent011fffcedfa2845179355052f69a2f0ceabd5852 (diff)
Added javascript automated test for CustomContainer
Just to make sure nothing blows up when you try subclassing in javascript. Fixed up some spacing problems in our test Makefile and tweaked it to allow for js tests of the sdk C code. [endlessm/eos-sdk#481]
Diffstat (limited to 'test/Makefile.am.inc')
-rw-r--r--test/Makefile.am.inc15
1 files changed, 8 insertions, 7 deletions
diff --git a/test/Makefile.am.inc b/test/Makefile.am.inc
index 08dd5e8..74f6fe6 100644
--- a/test/Makefile.am.inc
+++ b/test/Makefile.am.inc
@@ -5,16 +5,13 @@ TEST_LIBS = @EOS_SDK_LIBS@ $(top_builddir)/libendless-@EOS_SDK_API_VERSION@.la
ENDLESS_TESTS_DIRECTORY = $(top_srcdir)/test
noinst_PROGRAMS = \
- test/endless/run-tests \
+ test/endless/run-tests \
test/smoke-tests/hello \
- test/demos/flexy-grid
-
-include test/endless/Makefile.am.inc
-include test/demos/Makefile.am.inc
-include test/smoke-tests/Makefile.am.inc
+ test/demos/flexy-grid
+# This variable will be updated in Makefile subdirs (test/endless/Makefile.am.inc)
javascript_tests = \
- test/tools/eos-application-manifest/testInit.js \
+ test/tools/eos-application-manifest/testInit.js \
test/webhelper/testTranslate.js \
test/webhelper/testWebActions.js \
test/wikipedia/models/testCategoryModel.js \
@@ -23,6 +20,10 @@ javascript_tests = \
$(NULL)
EXTRA_DIST += $(javascript_tests)
+include test/endless/Makefile.am.inc
+include test/demos/Makefile.am.inc
+include test/smoke-tests/Makefile.am.inc
+
# Run tests when running 'make check'
TESTS = \
test/endless/run-tests \