diff mbox series

[v2,2/3] syscalls/stime: Add libc stime() detection

Message ID 1554433793-19702-2-git-send-email-yangx.jy@cn.fujitsu.com
State Changes Requested
Headers show
Series [v2,1/3] m4: Use common LTP_CHECK_LIBC_FUNCS to check libc implementations | expand

Commit Message

Xiao Yang April 5, 2019, 3:09 a.m. UTC 
Don't alway skip libc stime() for Android because bionic(Android libc)
may implement it in the future.

Also add break to fix potential compiler warnings.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 m4/ltp-libc-funcs.m4                        | 1 +
 testcases/kernel/syscalls/stime/stime_var.h | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/m4/ltp-libc-funcs.m4 b/m4/ltp-libc-funcs.m4
index 2c5c583..5b3f1ed 100644
--- a/m4/ltp-libc-funcs.m4
+++ b/m4/ltp-libc-funcs.m4
@@ -27,6 +27,7 @@  AC_CHECK_FUNCS([ \
 	renameat \
 	renameat2 \
 	splice \
+	stime \
 	syncfs \
 	sync_file_range \
 	tee \
diff --git a/testcases/kernel/syscalls/stime/stime_var.h b/testcases/kernel/syscalls/stime/stime_var.h
index b014f0a..342f762 100644
--- a/testcases/kernel/syscalls/stime/stime_var.h
+++ b/testcases/kernel/syscalls/stime/stime_var.h
@@ -8,6 +8,7 @@ 
 #define STIME_VAR__
 
 #include <sys/time.h>
+#include "config.h"
 #include "lapi/syscalls.h"
 
 #define TEST_VARIANTS 3
@@ -16,11 +17,12 @@  static int do_stime(time_t *ntime)
 {
 	switch (tst_variant) {
 	case 0:
-#ifdef __ANDROID__
-		tst_brk(TCONF, "libc stime() is not implemented on Android");
+#ifndef HAVE_STIME
+		tst_brk(TCONF, "libc stime() is not implemented");
 #else
 		return stime(ntime);
 #endif
+		break;
 	case 1:
 		return tst_syscall(__NR_stime, ntime);
 	case 2: {