aboutsummaryrefslogtreecommitdiff
path: root/sntp/unity
diff options
context:
space:
mode:
Diffstat (limited to 'sntp/unity')
-rw-r--r--sntp/unity/Makefile.in2
-rw-r--r--sntp/unity/unity_internals.h10
2 files changed, 8 insertions, 4 deletions
diff --git a/sntp/unity/Makefile.in b/sntp/unity/Makefile.in
index 927f648ffea8..424d7ca4497f 100644
--- a/sntp/unity/Makefile.in
+++ b/sntp/unity/Makefile.in
@@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
$(top_srcdir)/m4/ntp_cacheversion.m4 \
$(top_srcdir)/m4/ntp_compiler.m4 \
$(top_srcdir)/m4/ntp_crosscompile.m4 \
+ $(top_srcdir)/m4/ntp_crypto_rand.m4 \
$(top_srcdir)/m4/ntp_debug.m4 $(top_srcdir)/m4/ntp_dir_sep.m4 \
$(top_srcdir)/m4/ntp_facilitynames.m4 \
$(top_srcdir)/m4/ntp_harden.m4 $(top_srcdir)/m4/ntp_ipv6.m4 \
@@ -354,6 +355,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_OPENSSL = @PATH_OPENSSL@
PATH_RUBY = @PATH_RUBY@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
diff --git a/sntp/unity/unity_internals.h b/sntp/unity/unity_internals.h
index a04f52b478bb..3d22e7aa20e8 100644
--- a/sntp/unity/unity_internals.h
+++ b/sntp/unity/unity_internals.h
@@ -519,6 +519,9 @@ void UnityAssertDoubleSpecial(const _UD actual,
const UNITY_FLOAT_TRAIT_T style);
#endif
+void UnityExpectFailMessage(const char* msg,
+ const UNITY_LINE_TYPE line);
+
//-------------------------------------------------------
// Error Strings We Might Need
//-------------------------------------------------------
@@ -708,8 +711,7 @@ extern const char UnityStrErr64[];
//End of UNITY_INTERNALS_H
#endif
-//#define TEST_EXPECT_FAIL() Unity.isExpectingFail = 1;
-//#define TEST_EXPECT_FAIL_MESSAGE(message) Unity.isExpectingFail = 1; Unity.XFAILMessage = message; //PROBLEM : does this work on all compilers?
+// Not part of standard distribution
-#define TEST_EXPECT_FAIL() UnityExpectFail();
-#define TEST_EXPECT_FAIL_MESSAGE(message) UnityExpectFailMessage( (message) );
+#define TEST_EXPECT_FAIL() UnityExpectFail();
+#define TEST_EXPECT_FAIL_MESSAGE(message) UnityExpectFailMessage((message), __LINE__);