[src/trunk]: src/usr.bin/make/unit-tests make(1): add tests for numeric compa...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/68a32cdb87a4
branches:  trunk
changeset: 937675:68a32cdb87a4
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Aug 23 13:50:17 2020 +0000

description:
make(1): add tests for numeric comparisons in .if directives

diffstat:

 distrib/sets/lists/tests/mi                     |  14 ++++-
 usr.bin/make/unit-tests/Makefile                |   8 ++-
 usr.bin/make/unit-tests/cond-cmp-numeric-eq.exp |   1 +
 usr.bin/make/unit-tests/cond-cmp-numeric-eq.mk  |  53 +++++++++++++++++
 usr.bin/make/unit-tests/cond-cmp-numeric-ge.exp |   1 +
 usr.bin/make/unit-tests/cond-cmp-numeric-ge.mk  |  75 +++++++++++++++++++++++++
 usr.bin/make/unit-tests/cond-cmp-numeric-gt.exp |   1 +
 usr.bin/make/unit-tests/cond-cmp-numeric-gt.mk  |  73 ++++++++++++++++++++++++
 usr.bin/make/unit-tests/cond-cmp-numeric-le.exp |   1 +
 usr.bin/make/unit-tests/cond-cmp-numeric-le.mk  |  75 +++++++++++++++++++++++++
 usr.bin/make/unit-tests/cond-cmp-numeric-lt.exp |   1 +
 usr.bin/make/unit-tests/cond-cmp-numeric-lt.mk  |  73 ++++++++++++++++++++++++
 usr.bin/make/unit-tests/cond-cmp-numeric-ne.exp |   1 +
 usr.bin/make/unit-tests/cond-cmp-numeric-ne.mk  |  49 ++++++++++++++++
 14 files changed, 424 insertions(+), 2 deletions(-)

diffs (truncated from 502 to 300 lines):

diff -r 4c3de5de75b1 -r 68a32cdb87a4 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Sun Aug 23 13:35:46 2020 +0000
+++ b/distrib/sets/lists/tests/mi       Sun Aug 23 13:50:17 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.902 2020/08/23 09:18:25 rillig Exp $
+# $NetBSD: mi,v 1.903 2020/08/23 13:50:17 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -4541,6 +4541,18 @@
 ./usr/tests/usr.bin/make/unit-tests/cmdline.mk tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/comment.exp        tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/comment.mk tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-eq.exp    tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-eq.mk     tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-ge.exp    tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-ge.mk     tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-gt.exp    tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-gt.mk     tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-le.exp    tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-le.mk     tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-lt.exp    tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-lt.mk     tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-ne.exp    tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric-ne.mk     tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric.exp       tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cond-cmp-numeric.mk        tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cond-cmp-string.exp        tests-usr.bin-tests     compattestfile,atf
diff -r 4c3de5de75b1 -r 68a32cdb87a4 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Sun Aug 23 13:35:46 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Sun Aug 23 13:50:17 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2020/08/23 09:28:52 rillig Exp $
+# $NetBSD: Makefile,v 1.117 2020/08/23 13:50:17 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -39,6 +39,12 @@
 TESTS+=                cmdline
 TESTS+=                comment
 TESTS+=                cond-cmp-numeric
+TESTS+=                cond-cmp-numeric-eq
+TESTS+=                cond-cmp-numeric-ge
+TESTS+=                cond-cmp-numeric-gt
+TESTS+=                cond-cmp-numeric-le
+TESTS+=                cond-cmp-numeric-lt
+TESTS+=                cond-cmp-numeric-ne
 TESTS+=                cond-cmp-string
 TESTS+=                cond-func
 TESTS+=                cond-func-commands
diff -r 4c3de5de75b1 -r 68a32cdb87a4 usr.bin/make/unit-tests/cond-cmp-numeric-eq.exp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/cond-cmp-numeric-eq.exp   Sun Aug 23 13:50:17 2020 +0000
@@ -0,0 +1,1 @@
+exit status 0
diff -r 4c3de5de75b1 -r 68a32cdb87a4 usr.bin/make/unit-tests/cond-cmp-numeric-eq.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/cond-cmp-numeric-eq.mk    Sun Aug 23 13:50:17 2020 +0000
@@ -0,0 +1,53 @@
+# $NetBSD: cond-cmp-numeric-eq.mk,v 1.1 2020/08/23 13:50:17 rillig Exp $
+#
+# Tests for numeric comparisons with the == operator in .if conditions.
+
+# This comparison yields the same result, whether numeric or character-based.
+.if 1 == 1
+.else
+.error
+.endif
+
+# This comparison yields the same result, whether numeric or character-based.
+.if 1 == 2
+.error
+.endif
+
+.if 2 == 1
+.error
+.endif
+
+# Scientific notation is supported, as per strtod.
+.if 2e7 == 2000e4
+.else
+.error
+.endif
+
+.if 2000e4 == 2e7
+.else
+.error
+.endif
+
+# Trailing zeroes after the decimal point are irrelevant for the numeric
+# value.
+.if 3.30000 == 3.3
+.else
+.error
+.endif
+
+.if 3.3 == 3.30000
+.else
+.error
+.endif
+
+# As of 2020-08-23, numeric comparison is implemented as parsing both sides
+# as double, and then performing a normal comparison.  The range of double is
+# typically 16 or 17 significant digits, therefore these two numbers seem to
+# be equal.
+.if 1.000000000000000001 == 1.000000000000000002
+.else
+.error
+.endif
+
+all:
+       @:;
diff -r 4c3de5de75b1 -r 68a32cdb87a4 usr.bin/make/unit-tests/cond-cmp-numeric-ge.exp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/cond-cmp-numeric-ge.exp   Sun Aug 23 13:50:17 2020 +0000
@@ -0,0 +1,1 @@
+exit status 0
diff -r 4c3de5de75b1 -r 68a32cdb87a4 usr.bin/make/unit-tests/cond-cmp-numeric-ge.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/cond-cmp-numeric-ge.mk    Sun Aug 23 13:50:17 2020 +0000
@@ -0,0 +1,75 @@
+# $NetBSD: cond-cmp-numeric-ge.mk,v 1.1 2020/08/23 13:50:17 rillig Exp $
+#
+# Tests for numeric comparisons with the >= operator in .if conditions.
+
+# When both sides are equal, the >= operator always yields true.
+.if 1 >= 1
+.else
+.error
+.endif
+
+# This comparison yields the same result, whether numeric or character-based.
+.if 1 >= 2
+.error
+.endif
+
+.if 2 >= 1
+.else
+.error
+.endif
+
+# If this comparison were character-based instead of numerical, the
+# 5 would be >= 14 since its first digit is greater.
+.if 5 >= 14
+.error
+.endif
+
+.if 14 >= 5
+.else
+.error
+.endif
+
+# Scientific notation is supported, as per strtod.
+.if 2e7 >= 1e8
+.error
+.endif
+
+.if 1e8 >= 2e7
+.else
+.error
+.endif
+
+# Floating pointer numbers can be compared as well.
+# This might be tempting to use for version numbers, but there are a few pitfalls.
+.if 3.141 >= 111.222
+.error
+.endif
+
+.if 111.222 >= 3.141
+.else
+.error
+.endif
+
+# When parsed as a version number, 3.30 is greater than 3.7.
+# Since make parses numbers as plain numbers, that leads to wrong results.
+# Numeric comparisons are not suited for comparing version number.
+.if 3.30 >= 3.7
+.error
+.endif
+
+.if 3.7 >= 3.30
+.else
+.error
+.endif
+
+# As of 2020-08-23, numeric comparison is implemented as parsing both sides
+# as double, and then performing a normal comparison.  The range of double is
+# typically 16 or 17 significant digits, therefore these two numbers seem to
+# be equal.
+.if 1.000000000000000001 >= 1.000000000000000002
+.else
+.error
+.endif
+
+all:
+       @:;
diff -r 4c3de5de75b1 -r 68a32cdb87a4 usr.bin/make/unit-tests/cond-cmp-numeric-gt.exp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/cond-cmp-numeric-gt.exp   Sun Aug 23 13:50:17 2020 +0000
@@ -0,0 +1,1 @@
+exit status 0
diff -r 4c3de5de75b1 -r 68a32cdb87a4 usr.bin/make/unit-tests/cond-cmp-numeric-gt.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/cond-cmp-numeric-gt.mk    Sun Aug 23 13:50:17 2020 +0000
@@ -0,0 +1,73 @@
+# $NetBSD: cond-cmp-numeric-gt.mk,v 1.1 2020/08/23 13:50:17 rillig Exp $
+#
+# Tests for numeric comparisons with the > operator in .if conditions.
+
+# When both sides are equal, the > operator always yields false.
+.if 1 > 1
+.error
+.endif
+
+# This comparison yields the same result, whether numeric or character-based.
+.if 1 > 2
+.error
+.endif
+
+.if 2 > 1
+.else
+.error
+.endif
+
+# If this comparison were character-based instead of numerical, the
+# 5 would be > 14 since its first digit is greater.
+.if 5 > 14
+.error
+.endif
+
+.if 14 > 5
+.else
+.error
+.endif
+
+# Scientific notation is supported, as per strtod.
+.if 2e7 > 1e8
+.error
+.endif
+
+.if 1e8 > 2e7
+.else
+.error
+.endif
+
+# Floating pointer numbers can be compared as well.
+# This might be tempting to use for version numbers, but there are a few pitfalls.
+.if 3.141 > 111.222
+.error
+.endif
+
+.if 111.222 > 3.141
+.else
+.error
+.endif
+
+# When parsed as a version number, 3.30 is greater than 3.7.
+# Since make parses numbers as plain numbers, that leads to wrong results.
+# Numeric comparisons are not suited for comparing version number.
+.if 3.30 > 3.7
+.error
+.endif
+
+.if 3.7 > 3.30
+.else
+.error
+.endif
+
+# As of 2020-08-23, numeric comparison is implemented as parsing both sides
+# as double, and then performing a normal comparison.  The range of double is
+# typically 16 or 17 significant digits, therefore these two numbers seem to
+# be equal.
+.if 1.000000000000000001 > 1.000000000000000002
+.error
+.endif
+
+all:
+       @:;
diff -r 4c3de5de75b1 -r 68a32cdb87a4 usr.bin/make/unit-tests/cond-cmp-numeric-le.exp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/cond-cmp-numeric-le.exp   Sun Aug 23 13:50:17 2020 +0000
@@ -0,0 +1,1 @@
+exit status 0
diff -r 4c3de5de75b1 -r 68a32cdb87a4 usr.bin/make/unit-tests/cond-cmp-numeric-le.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/cond-cmp-numeric-le.mk    Sun Aug 23 13:50:17 2020 +0000
@@ -0,0 +1,75 @@
+# $NetBSD: cond-cmp-numeric-le.mk,v 1.1 2020/08/23 13:50:17 rillig Exp $
+#
+# Tests for numeric comparisons with the <= operator in .if conditions.
+
+# When both sides are equal, the <= operator always yields true.
+.if 1 <= 1
+.else
+.error
+.endif
+
+# This comparison yields the same result, whether numeric or character-based.
+.if 1 <= 2
+.else