From 74d1c2fcefb9dcbb9c7bc6915a5869322e794090 Mon Sep 17 00:00:00 2001 From: martijn Date: Fri, 2 Sep 2022 07:07:45 +0000 Subject: [PATCH] The sysORTable doesn't have 10 entries anymore. Adjust the test for now to -Cr4, which isn't exactly in the spirit of the test but fixes things for now. Now that we have agentx I should write a backend with more predictable output to make regress more stable. pointed out by anton@ --- regress/usr.bin/snmp/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/regress/usr.bin/snmp/Makefile b/regress/usr.bin/snmp/Makefile index c7eb269c1d6..af587e0ce79 100644 --- a/regress/usr.bin/snmp/Makefile +++ b/regress/usr.bin/snmp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2022/02/23 10:28:05 martijn Exp $ +# $OpenBSD: Makefile,v 1.5 2022/09/02 07:07:45 martijn Exp $ SNMP?= /usr/bin/snmp SNMPD?= /usr/sbin/snmpd -f ${.OBJDIR}/snmpd.conf @@ -845,31 +845,31 @@ getnext_multiple: REGRESS_TARGETS+= bulkget_simple CLEANFILES+= bulkget_simple.res bulkget_simple.exp bulkget_simple: - IDX=1; while [ $$IDX -le 10 ]; do ${SNMPGET} -v2c -cpublic 127.0.0.1 sysORDescr.$$IDX; IDX=$$((IDX+1)); done > $@.exp - ${SNMPBULKGET} -v2c -cpublic 127.0.0.1 sysORDescr > $@.res + IDX=1; while [ $$IDX -le 4 ]; do ${SNMPGET} -v2c -cpublic 127.0.0.1 sysORDescr.$$IDX; IDX=$$((IDX+1)); done > $@.exp + ${SNMPBULKGET} -v2c -cpublic -Cr4 127.0.0.1 sysORDescr > $@.res diff -up $@.exp $@.res REGRESS_TARGETS+= bulkget_multi CLEANFILES+= bulkget_multi.res bulkget_multi.exp bulkget_multi: > $@.exp - IDX=1; while [ $$IDX -le 10 ]; do ${SNMPGET} -v2c -cpublic 127.0.0.1 sysORDescr.$$IDX sysORID.$$IDX; IDX=$$((IDX+1)); done >> $@.exp - ${SNMPBULKGET} -v2c -cpublic 127.0.0.1 sysORDescr sysORID > $@.res + IDX=1; while [ $$IDX -le 4 ]; do ${SNMPGET} -v2c -cpublic 127.0.0.1 sysORDescr.$$IDX sysORID.$$IDX; IDX=$$((IDX+1)); done >> $@.exp + ${SNMPBULKGET} -v2c -cpublic -Cr4 127.0.0.1 sysORDescr sysORID > $@.res diff -up $@.exp $@.res REGRESS_TARGETS+= bulkget_nonrep CLEANFILES+= bulkget_nonrep.res bulkget_nonrep.exp bulkget_nonrep: ${SNMPGET} -v2c -cpublic 127.0.0.1 sysDescr.0 > $@.exp - IDX=1; while [ $$IDX -le 10 ]; do ${SNMPGET} -v2c -cpublic 127.0.0.1 sysORDescr.$$IDX; IDX=$$((IDX+1)); done >> $@.exp - ${SNMPBULKGET} -v2c -cpublic -Cn1 127.0.0.1 sysDescr sysORDescr > $@.res + IDX=1; while [ $$IDX -le 4 ]; do ${SNMPGET} -v2c -cpublic 127.0.0.1 sysORDescr.$$IDX; IDX=$$((IDX+1)); done >> $@.exp + ${SNMPBULKGET} -v2c -cpublic -Cn1 -Cr4 127.0.0.1 sysDescr sysORDescr > $@.res diff -up $@.exp $@.res REGRESS_TARGETS+= bulkget_maxrep CLEANFILES+= bulkget_maxrep.res bulkget_maxrep.exp bulkget_maxrep: - IDX=1; while [ $$IDX -le 5 ]; do ${SNMPGET} -v2c -cpublic 127.0.0.1 sysORDescr.$$IDX; IDX=$$((IDX+1)); done > $@.exp - ${SNMPBULKGET} -v2c -cpublic -Cr5 127.0.0.1 sysORDescr > $@.res + IDX=1; while [ $$IDX -le 4 ]; do ${SNMPGET} -v2c -cpublic 127.0.0.1 sysORDescr.$$IDX; IDX=$$((IDX+1)); done > $@.exp + ${SNMPBULKGET} -v2c -cpublic -Cr4 127.0.0.1 sysORDescr > $@.res diff -up $@.exp $@.res ### SNMP WALK -- 2.20.1