From f20ecbed945364299b95953909143c24c20c3f07 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 15 Jan 2015 11:12:58 +0100 Subject: [PATCH] Skip sodium_utils{2,3} tests when the target is Javascript --- configure.ac | 1 + test/default/Makefile.am | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0706f0a9..a104c322 100644 --- a/configure.ac +++ b/configure.ac @@ -432,6 +432,7 @@ AS_IF([test "x$EMSCRIPTEN" != "x"],[ TEST_LDFLAGS='--pre-js pre.js.inc' ]) AC_SUBST(TEST_LDFLAGS) +AM_CONDITIONAL([EMSCRIPTEN], [test "x$EMSCRIPTEN" != "x"]) dnl Libtool. diff --git a/test/default/Makefile.am b/test/default/Makefile.am index 7608bb71..6972848f 100644 --- a/test/default/Makefile.am +++ b/test/default/Makefile.am @@ -179,8 +179,6 @@ TESTS_TARGETS = \ sign \ sodium_core \ sodium_utils \ - sodium_utils2 \ - sodium_utils3 \ sodium_version \ stream \ stream2 \ @@ -188,6 +186,12 @@ TESTS_TARGETS = \ stream4 \ verify1 +if !EMSCRIPTEN +TESTS_TARGETS += \ + sodium_utils2 \ + sodium_utils3 +endif + check_PROGRAMS = $(TESTS_TARGETS) TESTS = $(TESTS_TARGETS)