From patchwork Tue Oct 5 01:56:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 45800 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6DD613857017 for ; Tue, 5 Oct 2021 01:56:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6DD613857017 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1633398999; bh=lL1JtsXJrOhu2t6XHDe5X+3PNYFzzJxUK+impS7EKJw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=k7ZjuHhd8WDaqwlQcL6ZWRO1itymchhwiQ60PjnQxWvQMcD4XjBROwfvYLGlF+TZM wMRur2heQ8sc99uPa9mU8WnIX4Y3bNra/TXKX7NcMK54IlVFm+7nQM7NY89i/8nfRx 3JQ06h+Vu19466Dzkyt3T9uqPCnB5MT2CUwxgj6s= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by sourceware.org (Postfix) with ESMTPS id A0AAD3858D39 for ; Tue, 5 Oct 2021 01:56:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A0AAD3858D39 Received: by mail-pg1-x530.google.com with SMTP id h3so7678110pgb.7 for ; Mon, 04 Oct 2021 18:56:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lL1JtsXJrOhu2t6XHDe5X+3PNYFzzJxUK+impS7EKJw=; b=dmULtIT6Xhm0WCREQaOXECmyQkbmzUvstSfZdaPXS4bm2TwACUFGOL8OAWu/Yorag4 RJ7zA5LEoOQp3pbACbOFJ3070kABNxy6Kd7FivwLyFmpnUmbynjZveenI1jZoKuWPHC5 XxwhcYJKpk2997dGLbRXOGo8rXaHQ2xQQEVTbXJBTftKqeudp/jo1A+bKgdOlTjbjkd9 lM9IvUWIINa2wj5lMTxnhzhlQidkajTFQMviS6vJx8KtkiaYZZ3MKT1atDolp1YCpd9V 3FpNkde2/gy3MS2ZUsgBtnUokF2HksTunAK++KmxzKKBWNw+HcSjYBINbXIQDIDuaKFa jMHw== X-Gm-Message-State: AOAM532c3JaTFD5QBd4gMLwthVIus6PN/7YrKYSY9AGU8opwWh3EcDq7 2DZZttlUE2CSokHxZcsn7BenRMKQjTE= X-Google-Smtp-Source: ABdhPJxrbikAxGQMYtyOi2o8xQZxy2deOV6HRBbU/bQv/zlVoHVDsakH/CESXJFxjTcjUtyfXua/VA== X-Received: by 2002:a05:6a00:43:b0:43d:f06e:4f4a with SMTP id i3-20020a056a00004300b0043df06e4f4amr28754528pfk.20.1633398977395; Mon, 04 Oct 2021 18:56:17 -0700 (PDT) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id x7sm116611pjl.55.2021.10.04.18.56.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 18:56:16 -0700 (PDT) To: GLIBC patches Subject: [PATCH] iconv: Use TIMEOUTFACTOR for iconv test timeout Date: Tue, 5 Oct 2021 10:56:10 +0900 Message-Id: <20211005015610.2067161-1-shorne@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Stafford Horne via Libc-alpha From: Stafford Horne Reply-To: Stafford Horne Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Currently the timeout for each iconv test is hard coded to 3 seconds. On my OpenRISC test platform this is too slow and the test fails with a HANG error. This change uses the available TIMEOUTFACTOR to compute the timeout. The default value is still 3. Reviewed-by: Adhemerval Zanella --- iconv/tst-iconv_prog.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iconv/tst-iconv_prog.sh b/iconv/tst-iconv_prog.sh index 14b7c08c91..2505f0f371 100644 --- a/iconv/tst-iconv_prog.sh +++ b/iconv/tst-iconv_prog.sh @@ -32,6 +32,8 @@ $codir/iconv/iconv_prog ' ICONV="$test_wrapper_env $run_program_env $ICONV" +TIMEOUTFACTOR=${TIMEOUTFACTOR:-1} + # List of known hangs; # Gathered by running an exhaustive 2 byte input search against glibc-2.28 hangarray=( @@ -222,7 +224,8 @@ execute_test () { eval PROG=\"$ICONV\" echo -en "$twobyte" \ - | timeout -k 4 3 $PROG $c -f $from -t "$to" &>/dev/null + | timeout -k 4 $((3*$TIMEOUTFACTOR)) \ + $PROG $c -f $from -t "$to" &>/dev/null ret=$? }