Page MenuHomeFreeBSD
Files F149348022

D51536.1789895912.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D51536.1789895912.diff
View Options

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20250726: Test case renamed
+OLD_FILES+=usr/tests/usr.bin/xargs/regress.n2147483647.out
+
# 20250726: This file is now installed in /etc/dma
OLD_FILES+=usr/share/examples/dma/auth.conf
diff --git a/usr.bin/xargs/tests/Makefile b/usr.bin/xargs/tests/Makefile
--- a/usr.bin/xargs/tests/Makefile
+++ b/usr.bin/xargs/tests/Makefile
@@ -17,7 +17,7 @@
${PACKAGE}FILES+= regress.in
${PACKAGE}FILES+= regress.n1.out
${PACKAGE}FILES+= regress.n2.out
-${PACKAGE}FILES+= regress.n2147483647.out
+${PACKAGE}FILES+= regress.nargmax.out
${PACKAGE}FILES+= regress.n2P0.out
${PACKAGE}FILES+= regress.n3.out
${PACKAGE}FILES+= regress.normal.out
diff --git a/usr.bin/xargs/tests/regress.n2147483647.out b/usr.bin/xargs/tests/regress.nargmax.out
rename from usr.bin/xargs/tests/regress.n2147483647.out
rename to usr.bin/xargs/tests/regress.nargmax.out
diff --git a/usr.bin/xargs/tests/regress.sh b/usr.bin/xargs/tests/regress.sh
--- a/usr.bin/xargs/tests/regress.sh
+++ b/usr.bin/xargs/tests/regress.sh
@@ -1,5 +1,5 @@
-echo 1..21
+echo 1..23
REGRESSION_START($1)
@@ -12,9 +12,8 @@
REGRESSION_TEST(`R-1', `xargs -I% -R-1 echo The % % % %% % % <${SRCDIR}/regress.in')
REGRESSION_TEST(`n1', `xargs -n1 echo <${SRCDIR}/regress.in')
REGRESSION_TEST(`n2', `xargs -n2 echo <${SRCDIR}/regress.in')
-# This test may consume a large amount of memory, making it unsuited to CI
-# environments. Disable it for now.
-#REGRESSION_TEST(`n2147483647', `xargs -n2147483647 <${SRCDIR}/regress.in')
+argmax=$(sysctl -n kern.argmax)
+REGRESSION_TEST(`nargmax', `xargs -n$argmax <${SRCDIR}/regress.in')
REGRESSION_TEST(`n2P0',`xargs -n2 -P0 echo <${SRCDIR}/regress.in | sort')
REGRESSION_TEST(`n3', `xargs -n3 echo <${SRCDIR}/regress.in')
REGRESSION_TEST(`0', `xargs -0 -n1 echo <${SRCDIR}/regress.0.in')
@@ -28,5 +27,6 @@
REGRESSION_TEST_FREEFORM(`parallel2', `echo /var/empty /var/empty/nodir | xargs -n1 -P2 test -d; [ $? = 1 ]')
REGRESSION_TEST_FREEFORM(`parallel3', `echo /var/empty/nodir /var/empty | xargs -n1 -P2 test -d; [ $? = 1 ]')
REGRESSION_TEST_FREEFORM(`parallel4', `echo /var/empty/nodir /var/empty/nodir | xargs -n1 -P2 test -d; [ $? = 1 ]')
+REGRESSION_TEST_FREEFORM(`ntoobig', `seq 42 | xargs -n$((argmax+1)); [ $? = 1 ]')
REGRESSION_END()
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -166,7 +166,7 @@
break;
case 'n':
nflag = 1;
- nargs = (int)strtonum(optarg, 1, INT_MAX, &errstr);
+ nargs = (int)strtonum(optarg, 1, arg_max, &errstr);
if (errstr)
errx(1, "-%c %s: %s", ch, optarg, errstr);
break;

File Metadata

Mime Type
text/plain
Expires
Sun, Sep 20, 9:18 AM (16 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29813244
Default Alt Text
D51536.1789895912.diff (2 KB)

Event Timeline