From 001aab42464d67e59ae63aada5bbe9987438c194 Mon Sep 17 00:00:00 2001 From: Mark Feit Date: Thu, 13 Jun 2024 14:27:58 +0000 Subject: [PATCH] Enable s3-benchmark for u24+ #1441 --- unibuild-order | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/unibuild-order b/unibuild-order index 220ba8ada..c8d0cf5fe 100755 --- a/unibuild-order +++ b/unibuild-order @@ -139,6 +139,7 @@ paris-traceroute # build this. define(HAVE_S3_BENCHMARK,ifelse(HAVE_GOLANG,0,0, FAMILY/eval(MAJOR == 11),Debian/1,HAVE_GOLANG, + DISTRO/eval(MAJOR >= 24),Ubuntu/1,HAVE_GOLANG, FAMILY,Debian,, 1)) ifelse(HAVE_S3_BENCHMARK,1,s3-benchmark) @@ -181,8 +182,7 @@ pscheduler-test-throughput # This has not been released. See also pscheduler-tool-nmapscan # pscheduler-test-openports --bundle extras pscheduler-test-rtt -#ifelse(HAVE_S3_BENCHMARK,1,pscheduler-test-s3throughput) -pscheduler-test-s3throughput +ifelse(HAVE_S3_BENCHMARK,1,pscheduler-test-s3throughput) pscheduler-test-simplestream pscheduler-test-snmpget --bundle snmp pscheduler-test-snmpgetbgm --bundle snmp @@ -223,8 +223,7 @@ pscheduler-tool-psclock pscheduler-tool-pstimer pscheduler-tool-psurl --bundle obsolete pscheduler-tool-pysnmp --bundle snmp -#ifelse(HAVE_S3_BENCHMARK,1,pscheduler-tool-s3-benchmark) -pscheduler-tool-s3-benchmark +ifelse(HAVE_S3_BENCHMARK,1,pscheduler-tool-s3-benchmark) pscheduler-tool-simplestreamer pscheduler-tool-sleep pscheduler-tool-sleepbgm