summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2015-05-20 14:54:34 -0700
committerCosimo Cecchi <cosimoc@gnome.org>2015-05-20 14:54:34 -0700
commit596b01daa99d8a5d1605cb57a4bbc6e7b0045edf (patch)
treeadc8629ee53a865d0cc4c7cf0976df1ac7f00fb4
parentc8f261facd1ff484678a6c496029ef91f7f4aa18 (diff)
parent6fa20055c60d92f7edd30daf3fcd6f4ef290ed18 (diff)
Merge pull request #3185 from endlessm/sdk/3172
Generate XML reports when running on Jenkins
-rw-r--r--configure.ac10
-rw-r--r--test/Makefile.am.inc1
2 files changed, 11 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index c71973e..4bc10e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,6 +201,16 @@ AM_COND_IF([ENABLE_JS_DOC], [], [can_make_dist=no])
AM_CONDITIONAL([CAN_MAKE_DIST], [test "x$can_make_dist" = "xyes"])
AC_MSG_RESULT([$can_make_dist])
+# JASMINE_JUNIT_REPORTS_DIR: Where to put test reports
+AC_MSG_CHECKING([where to put test reports])
+AC_ARG_VAR([JASMINE_JUNIT_REPORTS_DIR], [Where to put test reports])
+AS_IF([test -n "$JASMINE_JUNIT_REPORTS_DIR"],
+ [JASMINE_REPORT_ARGUMENT="--junit $JASMINE_JUNIT_REPORTS_DIR/\$\${log/%.log/.js.xml}"
+ AC_MSG_RESULT([in $JASMINE_JUNIT_REPORTS_DIR])],
+ [JASMINE_REPORT_ARGUMENT=
+ AC_MSG_RESULT([nowhere])])
+AC_SUBST([JASMINE_REPORT_ARGUMENT])
+
# Required libraries
# ------------------
PKG_CHECK_MODULES([EOS_SDK], [
diff --git a/test/Makefile.am.inc b/test/Makefile.am.inc
index dc90227..11e4dea 100644
--- a/test/Makefile.am.inc
+++ b/test/Makefile.am.inc
@@ -64,6 +64,7 @@ AM_JS_LOG_FLAGS = \
--include-path=$(top_srcdir)/webhelper \
--include-path=$(top_srcdir) \
--tap \
+ @JASMINE_REPORT_ARGUMENT@ \
--no-config \
$(NULL)
LOG_COMPILER = gtester