aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2017-04-21 15:38:30 +0800
committerngie <ngie@FreeBSD.org>2017-04-21 15:38:30 +0800
commit3ef9b715f899c001cc32d68d5e10558f91ee9740 (patch)
tree9470748d95abfd22c5ed7a92190292e34829431a
parentd922f16896417f19053d6928edca9b81d0c7edab (diff)
downloadfreebsd-ports-gnome-3ef9b715f899c001cc32d68d5e10558f91ee9740.tar.gz
freebsd-ports-gnome-3ef9b715f899c001cc32d68d5e10558f91ee9740.tar.zst
freebsd-ports-gnome-3ef9b715f899c001cc32d68d5e10558f91ee9740.zip
Fix utils/datetime_test:timestamp__subtraction
Don't expect a negative time delta to throw an exception--instead, expect 1 microsecond to be returned per the behavior change made in r436312. Approved by: brooks (as part of a larger diff), (maintainer timeout) Differential Revision: D10316 PR: 217973 Reported by: Jenkins Reviewed by: asomers Sponsored by: Dell EMC Isilon
-rw-r--r--devel/kyua/Makefile2
-rw-r--r--devel/kyua/files/patch-utils_datetime__test.cpp19
2 files changed, 20 insertions, 1 deletions
diff --git a/devel/kyua/Makefile b/devel/kyua/Makefile
index 19f9a03d3c0e..a739226f29ca 100644
--- a/devel/kyua/Makefile
+++ b/devel/kyua/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kyua
PORTVERSION= 0.13
PORTEPOCH= 3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \
LOCAL/jmmv
diff --git a/devel/kyua/files/patch-utils_datetime__test.cpp b/devel/kyua/files/patch-utils_datetime__test.cpp
new file mode 100644
index 000000000000..6b384313d2d4
--- /dev/null
+++ b/devel/kyua/files/patch-utils_datetime__test.cpp
@@ -0,0 +1,19 @@
+--- utils/datetime_test.cpp.orig 2017-04-08 05:25:26 UTC
++++ utils/datetime_test.cpp
+@@ -532,11 +532,11 @@ ATF_TEST_CASE_BODY(timestamp__subtractio
+ ATF_REQUIRE_EQ(datetime::delta(100, 0), ts3 - ts1);
+ ATF_REQUIRE_EQ(datetime::delta(99, 999988), ts3 - ts2);
+
+- ATF_REQUIRE_THROW_RE(
+- std::runtime_error,
+- "Cannot subtract 1291970850123456us from 1291970750123468us "
+- ".*negative datetime::delta.*not supported",
+- ts2 - ts3);
++ /*
++ * NOTE (ngie): behavior change for
++ * https://github.com/jmmv/kyua/issues/155 .
++ */
++ ATF_REQUIRE_EQ(datetime::delta::from_microseconds(1), ts2 - ts3);
+ }
+
+