commit fc3d7bc8406092550485f49bec78d5b2679f5b16
author Gregory Montoir <gregory.montoir@gmail.com> Tue Sep 08 13:01:06 2020 +0800
committer Kalesh Singh <kaleshsingh@google.com> Wed Sep 09 17:02:10 2020 +0000
tree 5758935bae5a35a9c29c5f07e6296798a260c813
parent b483ea889abd8c3d417ef43d409161802d6b4b8a

VTS: kselftest rtctest

Simplify RTC presence check

Exempt-From-Owner-Approval: smuckle@ is OOO

Bug: 166143014
Change-Id: I2bcbe6fa744889e4b698ea36c68ff98898455518
(cherry picked from commit 350ec5e167dbdbf2edf281a7dd9232e38af47a0c)

tools/testing/selftests/rtc/rtctest.c

diff --git a/tools/testing/selftests/rtc/rtctest.c b/tools/testing/selftests/rtc/rtctest.c
index 852e7a4..845f077 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;
 };
@@ -345,6 +325,8 @@
 
 int main(int argc, char **argv)
 {
+	struct stat st;
+
 	switch (argc) {
 	case 2:
 		rtc_file = argv[1];
@@ -356,8 +338,10 @@
 		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);
 }