diff options
| author | Gregory Montoir <gregory.montoir@gmail.com> | 2020-09-08 13:01:06 +0800 |
|---|---|---|
| committer | Kalesh Singh <kaleshsingh@google.com> | 2020-09-08 16:09:46 +0000 |
| commit | 350ec5e167dbdbf2edf281a7dd9232e38af47a0c (patch) | |
| tree | c788af005003edf9201e21ea11f482c4a4796410 | |
| parent | 50b4a0ffbdfdcf305f93b877c0bad956652f1eed (diff) | |
| download | platform_external_linux-kselftest-android10-tests-dev.tar.gz platform_external_linux-kselftest-android10-tests-dev.tar.bz2 platform_external_linux-kselftest-android10-tests-dev.zip | |
VTS: kselftest rtctestandroid10-tests-dev
Simplify RTC presence check
Exempt-From-Owner-Approval: smuckle@ is OOO
Bug: 166143014
Change-Id: I2bcbe6fa744889e4b698ea36c68ff98898455518
| -rw-r--r-- | tools/testing/selftests/rtc/rtctest.c | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/tools/testing/selftests/rtc/rtctest.c b/tools/testing/selftests/rtc/rtctest.c index efc7bcfdbd46..77c574b42694 100644 --- a/tools/testing/selftests/rtc/rtctest.c +++ b/tools/testing/selftests/rtc/rtctest.c @@ -5,14 +5,13 @@ * Copyright (c) 2018 Alexandre Belloni <alexandre.belloni@bootlin.com> */ -#include <dirent.h> #include <errno.h> #include <fcntl.h> #include <linux/rtc.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> #include <sys/ioctl.h> +#include <sys/stat.h> #include <sys/time.h> #include <sys/types.h> #include <time.h> @@ -25,25 +24,6 @@ static char *rtc_file = "/dev/rtc0"; -/* Returns 1 if file matching /dev/rtc* is found, else 0. */ -static int has_rtc(void) -{ - DIR *dev_dir; - struct dirent *dir; - - dev_dir = opendir("/dev"); - if (!dev_dir) - return 0; - while ((dir = readdir(dev_dir))) { - if (!strncmp(dir->d_name, "rtc", 3)) { - closedir(dev_dir); - return 1; - } - } - closedir(dev_dir); - return 0; -} - FIXTURE(rtc) { int fd; }; @@ -246,6 +226,8 @@ __constructor_order_last(void) int main(int argc, char **argv) { + struct stat st; + switch (argc) { case 2: rtc_file = argv[1]; @@ -257,8 +239,10 @@ int main(int argc, char **argv) return 1; } - if (!has_rtc()) + if (stat(rtc_file, &st) < 0 || !S_ISCHR(st.st_mode)) { + printf("no RTC present\n"); return 0; + } return test_harness_run(argc, argv); } |