From b1542e769913a9f8d6b74746bbfc8e44a9ba494c Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Wed, 14 Apr 2021 10:35:02 +0800 Subject: [PATCH] qa: update the ffsb.sh to clone it from git://git.ceph.com/ffsb.git Have add a ffsb repo under git://git.ceph.com/ to tracker the change histories. And in that repo we have modernize the form of AM_INIT_AUTOMAKE. Fixes: https://tracker.ceph.com/issues/48365 Signed-off-by: Xiubo Li --- qa/workunits/suites/ffsb.patch | 12 ------------ qa/workunits/suites/ffsb.sh | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 qa/workunits/suites/ffsb.patch diff --git a/qa/workunits/suites/ffsb.patch b/qa/workunits/suites/ffsb.patch deleted file mode 100644 index a51217595997..000000000000 --- a/qa/workunits/suites/ffsb.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp 1/parser.c 2/parser.c ---- 1/parser.c 2008-10-28 04:17:05.000000000 +0800 -+++ 2/parser.c 2018-06-26 20:25:59.000000000 +0800 -@@ -203,7 +203,7 @@ static char *get_optstr(char *buf, char - len = strnlen(string, BUFSIZE); - sprintf(search_str, "%s=%%%ds\\n", string, BUFSIZE - len-1); - if (1 == sscanf(line, search_str, &temp)) { -- len = strnlen(temp, 4096); -+ len = strnlen(temp, 4095) + 1; - ret_buf = malloc(len); - strncpy(ret_buf, temp, len); - return ret_buf; diff --git a/qa/workunits/suites/ffsb.sh b/qa/workunits/suites/ffsb.sh index e44519553d34..a6ec7d198af9 100755 --- a/qa/workunits/suites/ffsb.sh +++ b/qa/workunits/suites/ffsb.sh @@ -4,10 +4,18 @@ set -e mydir=`dirname $0` -wget http://download.ceph.com/qa/ffsb.tar.bz2 -tar jxvf ffsb.tar.bz2 -cd ffsb-6.0-rc2 -patch -p1 < $mydir/ffsb.patch +# try it again if the clone is slow and the second time +trap -- 'retry' EXIT +retry() { + rm -rf ffsb + # double the timeout value + timeout 3600 git clone git://git.ceph.com/ffsb.git --depth 1 +} +rm -rf ffsb +timeout 1800 git clone git://git.ceph.com/ffsb.git --depth 1 +trap - EXIT + +cd ffsb ./configure make cd .. @@ -16,7 +24,7 @@ cd tmp for f in $mydir/*.ffsb do - ../ffsb-*/ffsb $f + ../ffsb/ffsb $f done cd .. rm -r tmp ffsb* -- 2.47.3