From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id C2D526EC60; Mon, 5 Jul 2021 15:13:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C2D526EC60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1625487192; bh=UVSrQdoYpKG1DvEOR5AodTu/KrM2GpMYKEQdkRIA7G8=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=d/JeruHBAibFqPWU6LYC1uZxick7T1vaYIuFjv3Mxzrp7xzT4kdRWXFXVnoGtYSwJ ncDCIxFoCYCuEEwFpCerPhp64+pLEau33DT7Sd6BXEPivtzewnzWqYlwOL/RXNP1eQ WjvtcecXyOdvUSxEOIQbEm2h+gFc0Gsftckei074= Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 825766EC41 for ; Mon, 5 Jul 2021 14:50:14 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 825766EC41 Received: by mail-lf1-f44.google.com with SMTP id bq39so19390948lfb.12 for ; Mon, 05 Jul 2021 04:50:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m33FYes5edX6DWmP8Tmf6UrKCGb3q7+Qi10w7xX9e2w=; b=dUTNhxGDkdotfvmPQPDYMsljWxChTIF7kg4X1ZJGIptETxl4+sPsfmZXaUNjnXc+dy D05/8yCuNBQExJPnRzSNUaK40B2A0naowrZXIfXUQsOtSphzan0blISTk3uzawTCehKy tjjw9HXCKldhL+3+TG88IPto0jh3uIvoiTA7iHT7j2HzWc7uv/l03s+COMFljO7gCS7g QvVlfYMOkNsxby8JFeRInZpFBt/Dz6VgahY/me/OASQHm/VfE6hmE1G4O+jjW6M82jCi f6+/ulsZMAbxAJOW5JuqfHoq1oG/akXjfQGmcCo8nViLPzNFPe9ucnU4FJTJES8NG1TA qGdQ== X-Gm-Message-State: AOAM533r7BWFCoTMS1jk5qnOSivrTcjZkb5zWBImPsX14bJ9p9SFj8AN xXTReFp0Ka7nPzDCI/R66xm5JPggVEmcxGV7EK0= X-Google-Smtp-Source: ABdhPJxZqnZIYi9kkJB00Oa/hIk5aB1fu6+rBDnohgBZtqdxICcGP+eytKITBpeiSZEBSF5KtSrLjg== X-Received: by 2002:a05:6512:228d:: with SMTP id f13mr10439532lfu.229.1625485813890; Mon, 05 Jul 2021 04:50:13 -0700 (PDT) Received: from localhost.localdomain ([2a00:1370:8131:39a8:2c0a:28e8:e4ad:bc59]) by smtp.gmail.com with ESMTPSA id k8sm1059050lfc.25.2021.07.05.04.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jul 2021 04:50:13 -0700 (PDT) To: tarantool-patches@dev.tarantool.org, imun@tarantool.org, skaplun@tarantool.org Date: Mon, 5 Jul 2021 14:49:44 +0300 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Mon, 05 Jul 2021 15:13:09 +0300 Subject: [Tarantool-patches] [PATCH 3/4] test: CI-environment X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Maxim Kokryashkin Part of tarantool/tarantool#5970 --- The patch `fperrad/lua-Harness@6c2aa87` makes 309-os.t check `os.getenv()` function by examining HOME environment variable instead of USER, so we don't need to set USERNAME explicitly anymore, as it stated in POSIX standard that every user must have HOME varibale set. Therefore, `tarantool/luajit@45ed138` should be replaced with `fperrad/lua-Harness@6c2aa87`. test/lua-Harness-tests/309-os.t | 4 ++-- test/lua-Harness-tests/CMakeLists.txt | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/test/lua-Harness-tests/309-os.t b/test/lua-Harness-tests/309-os.t index 8258e8af..a55d272a 100755 --- a/test/lua-Harness-tests/309-os.t +++ b/test/lua-Harness-tests/309-os.t @@ -169,8 +169,8 @@ end do -- getenv is(os.getenv('__IMPROBABLE__'), nil, "function getenv") - local user = os.getenv('LOGNAME') or os.getenv('USERNAME') - type_ok(user, 'string', "function getenv") + local home = os.getenv('HOME') or os.getenv('HOMEPATH') + type_ok(home, 'string', "function getenv") end do -- remove diff --git a/test/lua-Harness-tests/CMakeLists.txt b/test/lua-Harness-tests/CMakeLists.txt index 9fddd625..b9804033 100644 --- a/test/lua-Harness-tests/CMakeLists.txt +++ b/test/lua-Harness-tests/CMakeLists.txt @@ -26,11 +26,6 @@ add_custom_command(TARGET lua-Harness-tests COMMAND env LUA_PATH="${LUA_PATH}\;" - # XXX: 309-os.t checks os.getenv() function by examining - # USERNAME or LOGNAME environment variable. - # These variables might not be set in the environment, so - # set one of them explicitly. - USERNAME="fperrad" ${PROVE} ${CMAKE_CURRENT_SOURCE_DIR} --exec '${LUAJIT_TEST_COMMAND} -l profile_luajit21' ${LUA_TEST_FLAGS} -- 2.31.1