From patchwork Wed Jun 1 18:53:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 69058 Delivered-To: patches@linaro.org Received: by 10.140.92.199 with SMTP id b65csp255142qge; Wed, 1 Jun 2016 11:53:36 -0700 (PDT) X-Received: by 10.98.2.74 with SMTP id 71mr11564277pfc.49.1464807215073; Wed, 01 Jun 2016 11:53:35 -0700 (PDT) Return-Path: Received: from mail-pf0-x234.google.com (mail-pf0-x234.google.com. [2607:f8b0:400e:c00::234]) by mx.google.com with ESMTPS id k8si35380272pfb.102.2016.06.01.11.53.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2016 11:53:35 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::234 as permitted sender) client-ip=2607:f8b0:400e:c00::234; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::234 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x234.google.com with SMTP id f144so20209292pfa.3 for ; Wed, 01 Jun 2016 11:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+hFdgOUHM9WHyiist41CNAlkqxBhL9mk373U6Gxq404=; b=KnSdB9bo9+A7N44DsETcdlh0uzd/LWTq9jf0tHjX8bulawwfiuYp1nfjA2PpPUm/PZ AgEARlRe3psHFCxEDJwLFN1EgAeme29YAEUqf+QtVBLfkboQoMR78/4gL7DoGgtT/SkR mmVCurUsVFTK1RXQaOh8FTsIpO+gcSZYjtzI8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+hFdgOUHM9WHyiist41CNAlkqxBhL9mk373U6Gxq404=; b=YbpzRV6z3HBbK5bd9aXnc4EIftpuL5c5NvQ5WdBzLdhDbxt8vEh5L65HvBJzkhjaJN J13eYszKBIsPvEUQqJIVgXJ5ZUysLa76FDCIq7UA1xQbsDjYdIf/iacJ3IfIEqj1LBbO Je9EWB2f9WiJ6Ycz9m2Fn2C8LfwhrF8iPDRBPDhH3Kmw8GkLvG06Ny/0nhGGgYI6heUS 73tU8ayyIpctvorMex7hHk2IXmmmb4RCYGDyx/RrjoUwlFhBJhxJ1Zkk7XC+ELoiLKeB ptsEU8sv014fW8yLMs4saCU85Y61PJ3rH8EaUVAPezMEvd+/0Yo4ftau2vBvCcuSPqJm +03A== X-Gm-Message-State: ALyK8tIevyZsE080+VlCYlAiG3EnY8SpBvGdOlK1qqu/fDSMw3pn14X2NxGY4OQUorETBrcyvcw= X-Received: by 10.98.54.133 with SMTP id d127mr11805316pfa.104.1464807214740; Wed, 01 Jun 2016 11:53:34 -0700 (PDT) Return-Path: Received: from localhost.localdomain (c-73-67-244-238.hsd1.or.comcast.net. [73.67.244.238]) by smtp.gmail.com with ESMTPSA id t77sm49839932pfa.71.2016.06.01.11.53.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 11:53:34 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Mika Westerberg , Baolin Wang , Thomas Gleixner , Shuah Khan , Arnd Bergmann , Ingo Molnar , Richard Cochran , Prarit Bhargava Subject: [PATCH 2/2] kselftests: timers: Add set-tz test case Date: Wed, 1 Jun 2016 11:53:27 -0700 Message-Id: <1464807207-16530-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464807207-16530-1-git-send-email-john.stultz@linaro.org> References: <1464807207-16530-1-git-send-email-john.stultz@linaro.org> Mika Westerberg reported a erroneous change in the error checking of settimeofday, so I wanted to add a test to ensure we don't trip over this again. Cc: Mika Westerberg Cc: Baolin Wang Cc: Thomas Gleixner Cc: Shuah Khan Cc: Arnd Bergmann Cc: Ingo Molnar Cc: Richard Cochran Cc: Prarit Bhargava Signed-off-by: John Stultz --- tools/testing/selftests/timers/Makefile | 3 +- tools/testing/selftests/timers/set-tz.c | 119 ++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timers/set-tz.c -- 1.9.1 diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile index 4a1be1b..1d55568 100644 --- a/tools/testing/selftests/timers/Makefile +++ b/tools/testing/selftests/timers/Makefile @@ -10,7 +10,7 @@ TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ TEST_PROGS_EXTENDED = alarmtimer-suspend valid-adjtimex adjtick change_skew \ skew_consistency clocksource-switch leap-a-day \ - leapcrash set-tai set-2038 + leapcrash set-tai set-2038 set-tz bins = $(TEST_PROGS) $(TEST_PROGS_EXTENDED) @@ -30,6 +30,7 @@ run_destructive_tests: run_tests ./clocksource-switch ./leap-a-day -s -i 10 ./leapcrash + ./set-tz ./set-tai ./set-2038 diff --git a/tools/testing/selftests/timers/set-tz.c b/tools/testing/selftests/timers/set-tz.c new file mode 100644 index 0000000..f418492 --- /dev/null +++ b/tools/testing/selftests/timers/set-tz.c @@ -0,0 +1,119 @@ +/* Set tz value + * by: John Stultz + * (C) Copyright Linaro 2016 + * Licensed under the GPLv2 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + + +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef KTEST +#include "../kselftest.h" +#else +static inline int ksft_exit_pass(void) +{ + exit(0); +} +static inline int ksft_exit_fail(void) +{ + exit(1); +} +#endif + +int set_tz(int min, int dst) +{ + struct timezone tz; + + tz.tz_minuteswest = min; + tz.tz_dsttime = dst; + + return settimeofday(0, &tz); +} + +int get_tz_min(void) +{ + struct timezone tz; + struct timeval tv; + + memset(&tz, 0, sizeof(tz)); + gettimeofday(&tv, &tz); + return tz.tz_minuteswest; +} + +int get_tz_dst(void) +{ + struct timezone tz; + struct timeval tv; + + memset(&tz, 0, sizeof(tz)); + gettimeofday(&tv, &tz); + return tz.tz_dsttime; +} + +int main(int argc, char **argv) +{ + int i, ret; + int min, dst; + + min = get_tz_min(); + dst = get_tz_dst(); + printf("tz_minuteswest started at %i, dst at %i\n", min, dst); + + printf("Checking tz_minuteswest can be properly set: "); + for (i = -15*60; i < 15*60; i += 30) { + ret = set_tz(i, dst); + ret = get_tz_min(); + if (ret != i) { + printf("[FAILED] expected: %i got %i\n", i, ret); + goto err; + } + } + printf("[OK]\n"); + + printf("Checking invalid tz_minuteswest values are caught: "); + + if (!set_tz(-15*60-1, dst)) { + printf("[FAILED] %i didn't return failure!\n", -15*60-1); + goto err; + } + + if (!set_tz(15*60+1, dst)) { + printf("[FAILED] %i didn't return failure!\n", 15*60+1); + goto err; + } + + if (!set_tz(-24*60, dst)) { + printf("[FAILED] %i didn't return failure!\n", -24*60); + goto err; + } + + if (!set_tz(24*60, dst)) { + printf("[FAILED] %i didn't return failure!\n", 24*60); + goto err; + } + + printf("[OK]\n"); + + set_tz(min, dst); + return ksft_exit_pass(); + +err: + set_tz(min, dst); + return ksft_exit_fail(); +}