public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sandbox:stable-2.x commit in: tests/, /
@ 2025-01-08  2:12 Mike Gilbert
  2025-01-14  4:38 ` [gentoo-commits] proj/sandbox:master " Mike Gilbert
  0 siblings, 1 reply; 3+ messages in thread
From: Mike Gilbert @ 2025-01-08  2:12 UTC (permalink / raw
  To: gentoo-commits

commit:     6a8c9e4621d3df8277eae4f4a7d9fed5effd2d63
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 17:26:54 2025 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 17:28:20 2025 +0000
URL:        https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=6a8c9e46

tests: replace _LARGEFILE64_SOURCE with _FILE_OFFSET_BITS=64

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 configure.ac          |  2 ++
 tests/creat64-0.c     | 18 ++----------------
 tests/fopen64-0.c     | 18 ++----------------
 tests/mkostemp-0.c    |  2 ++
 tests/mkostemp64-0.c  | 18 ++----------------
 tests/mkostemps-0.c   |  2 ++
 tests/mkostemps64-0.c | 22 ++--------------------
 tests/mkstemp-0.c     |  2 ++
 tests/mkstemp64-0.c   | 15 ++-------------
 tests/mkstemps-0.c    |  2 ++
 tests/mkstemps64-0.c  | 19 ++-----------------
 tests/open64-0.c      | 18 ++----------------
 tests/openat-0.c      |  2 ++
 tests/openat64-0.c    | 24 ++----------------------
 tests/truncate64-0.c  | 21 ++-------------------
 tests/utimensat-0.c   |  2 ++
 tests/utimensat64-0.c |  3 ++-
 17 files changed, 34 insertions(+), 156 deletions(-)

diff --git a/configure.ac b/configure.ac
index f58da0b..d690440 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,6 +241,8 @@ AC_CHECK_FUNCS_ONCE(m4_flatten([
 	unshare
 	utime
 	utimensat
+	__utimensat64
+	__utimensat_time64
 	utimes
 ]))
 AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler],

diff --git a/tests/creat64-0.c b/tests/creat64-0.c
index f900c58..ebbbbfc 100644
--- a/tests/creat64-0.c
+++ b/tests/creat64-0.c
@@ -1,17 +1,3 @@
 #define CONFIG HAVE_CREAT64
-#define FUNC creat64
-#define SFUNC "creat64"
-#define FUNC_STR "\"%s\", %o"
-#define FUNC_IMP file, mode
-#define ARG_CNT 2
-#define ARG_USE "<file> <mode>"
-
-#define process_args() \
-	s = argv[i++]; \
-	const char *file = f_get_file(s); \
-	\
-	s = argv[i++]; \
-	mode_t mode = sscanf_mode_t(s);
-
-#define _LARGEFILE64_SOURCE
-#include "test-skel-0.c"
+#define _FILE_OFFSET_BITS 64
+#include "creat-0.c"

diff --git a/tests/fopen64-0.c b/tests/fopen64-0.c
index 2c229b9..3fee0cd 100644
--- a/tests/fopen64-0.c
+++ b/tests/fopen64-0.c
@@ -1,17 +1,3 @@
 #define CONFIG HAVE_FOPEN64
-#define FUNC fopen64
-#define SFUNC "fopen64"
-#define FUNC_STR "\"%s\", \"%s\""
-#define FUNC_IMP file, mode
-#define ARG_CNT 2
-#define ARG_USE "<file> <strmode>"
-
-#define process_args() \
-	s = argv[i++]; \
-	const char *file = f_get_file(s); \
-	\
-	s = argv[i++]; \
-	char *mode = s;
-
-#define _LARGEFILE64_SOURCE
-#include "test-skel-0.c"
+#define _FILE_OFFSET_BITS 64
+#include "fopen-0.c"

diff --git a/tests/mkostemp-0.c b/tests/mkostemp-0.c
index 65cf8c2..2c520b2 100644
--- a/tests/mkostemp-0.c
+++ b/tests/mkostemp-0.c
@@ -1,4 +1,6 @@
+#ifndef CONFIG
 #define CONFIG HAVE_MKOSTEMP
+#endif
 #define FUNC mkostemp
 #define SFUNC "mkostemp"
 #define FUNC_STR "\"%s\", %#x"

diff --git a/tests/mkostemp64-0.c b/tests/mkostemp64-0.c
index d3c7f7c..88412bc 100644
--- a/tests/mkostemp64-0.c
+++ b/tests/mkostemp64-0.c
@@ -1,17 +1,3 @@
 #define CONFIG HAVE_MKOSTEMP64
-#define FUNC mkostemp64
-#define SFUNC "mkostemp64"
-#define FUNC_STR "\"%s\", %#x"
-#define FUNC_IMP template, flags
-#define ARG_CNT 2
-#define ARG_USE "<template> <fflags>"
-
-#define process_args() \
-	s = argv[i++]; \
-	char *template = s; \
-	\
-	s = argv[i++]; \
-	int flags = f_get_flags(s);
-
-#define _LARGEFILE64_SOURCE
-#include "test-skel-0.c"
+#define _FILE_OFFSET_BITS 64
+#include "mkostemp-0.c"

diff --git a/tests/mkostemps-0.c b/tests/mkostemps-0.c
index 739a491..40c30de 100644
--- a/tests/mkostemps-0.c
+++ b/tests/mkostemps-0.c
@@ -1,4 +1,6 @@
+#ifndef CONFIG
 #define CONFIG HAVE_MKOSTEMPS
+#endif
 #define FUNC mkostemps
 #define SFUNC "mkostemps"
 #define FUNC_STR "\"%s\", %i, %#x"

diff --git a/tests/mkostemps64-0.c b/tests/mkostemps64-0.c
index 9328a0c..7e9f5eb 100644
--- a/tests/mkostemps64-0.c
+++ b/tests/mkostemps64-0.c
@@ -1,21 +1,3 @@
 #define CONFIG HAVE_MKOSTEMPS64
-#define FUNC mkostemps64
-#define SFUNC "mkostemps64"
-#define FUNC_STR "\"%s\", %i, %#x"
-#define FUNC_IMP template, suffixlen, flags
-#define ARG_CNT 3
-#define ARG_USE "<template> <suffixlen> <fflags>"
-
-#define process_args() \
-	s = argv[i++]; \
-	char *template = s; \
-	\
-	s = argv[i++]; \
-	int suffixlen = 0; \
-	sscanf(s, "%i", &suffixlen); \
-	\
-	s = argv[i++]; \
-	int flags = f_get_flags(s);
-
-#define _LARGEFILE64_SOURCE
-#include "test-skel-0.c"
+#define _FILE_OFFSET_BITS 64
+#include "mkostemps-0.c"

diff --git a/tests/mkstemp-0.c b/tests/mkstemp-0.c
index a81344b..d97a3a2 100644
--- a/tests/mkstemp-0.c
+++ b/tests/mkstemp-0.c
@@ -1,4 +1,6 @@
+#ifndef CONFIG
 #define CONFIG HAVE_MKSTEMP
+#endif
 #define FUNC mkstemp
 #define SFUNC "mkstemp"
 #define FUNC_STR "\"%s\""

diff --git a/tests/mkstemp64-0.c b/tests/mkstemp64-0.c
index cc42d59..3f37d6f 100644
--- a/tests/mkstemp64-0.c
+++ b/tests/mkstemp64-0.c
@@ -1,14 +1,3 @@
 #define CONFIG HAVE_MKSTEMP64
-#define FUNC mkstemp64
-#define SFUNC "mkstemp64"
-#define FUNC_STR "\"%s\""
-#define FUNC_IMP template
-#define ARG_CNT 1
-#define ARG_USE "<template>"
-
-#define process_args() \
-	s = argv[i++]; \
-	char *template = s;
-
-#define _LARGEFILE64_SOURCE
-#include "test-skel-0.c"
+#define _FILE_OFFSET_BITS 64
+#include "mkstemp-0.c"

diff --git a/tests/mkstemps-0.c b/tests/mkstemps-0.c
index e1c73fc..8776432 100644
--- a/tests/mkstemps-0.c
+++ b/tests/mkstemps-0.c
@@ -1,4 +1,6 @@
+#ifndef CONFIG
 #define CONFIG HAVE_MKSTEMPS
+#endif
 #define FUNC mkstemps
 #define SFUNC "mkstemps"
 #define FUNC_STR "\"%s\", %i"

diff --git a/tests/mkstemps64-0.c b/tests/mkstemps64-0.c
index af9f25c..3f6f5bf 100644
--- a/tests/mkstemps64-0.c
+++ b/tests/mkstemps64-0.c
@@ -1,18 +1,3 @@
 #define CONFIG HAVE_MKSTEMPS64
-#define FUNC mkstemps64
-#define SFUNC "mkstemps64"
-#define FUNC_STR "\"%s\", %i"
-#define FUNC_IMP template, suffixlen
-#define ARG_CNT 2
-#define ARG_USE "<template> <suffixlen>"
-
-#define process_args() \
-	s = argv[i++]; \
-	char *template = s; \
-	\
-	s = argv[i++]; \
-	int suffixlen = 0; \
-	sscanf(s, "%i", &suffixlen);
-
-#define _LARGEFILE64_SOURCE
-#include "test-skel-0.c"
+#define _FILE_OFFSET_BITS 64
+#include "mkstemps-0.c"

diff --git a/tests/open64-0.c b/tests/open64-0.c
index e6befb5..f36d98b 100644
--- a/tests/open64-0.c
+++ b/tests/open64-0.c
@@ -1,17 +1,3 @@
 #define CONFIG HAVE_OPEN64
-#define FUNC open64
-#define SFUNC "open64"
-#define FUNC_STR "\"%s\", %o"
-#define FUNC_IMP file, flags
-#define ARG_CNT 2
-#define ARG_USE "<file> <fflags>"
-
-#define process_args() \
-	s = argv[i++]; \
-	const char *file = f_get_file(s); \
-	\
-	s = argv[i++]; \
-	int flags = f_get_flags(s);
-
-#define _LARGEFILE64_SOURCE
-#include "test-skel-0.c"
+#define _FILE_OFFSET_BITS 64
+#include "open-0.c"

diff --git a/tests/openat-0.c b/tests/openat-0.c
index 24f230b..c616a06 100644
--- a/tests/openat-0.c
+++ b/tests/openat-0.c
@@ -1,4 +1,6 @@
+#ifndef CONFIG
 #define CONFIG HAVE_OPENAT
+#endif
 #define FUNC openat
 #define SFUNC "openat"
 #define FUNC_STR "%i, \"%s\", %#x, %o"

diff --git a/tests/openat64-0.c b/tests/openat64-0.c
index 0b8ab19..02c6474 100644
--- a/tests/openat64-0.c
+++ b/tests/openat64-0.c
@@ -1,23 +1,3 @@
 #define CONFIG HAVE_OPENAT64
-#define FUNC openat64
-#define SFUNC "openat64"
-#define FUNC_STR "%i, \"%s\", %#x, %o"
-#define FUNC_IMP dirfd, file, flags, mode
-#define ARG_CNT 4
-#define ARG_USE "<dirfd> <file> <fflags> <mode>"
-
-#define process_args() \
-	s = argv[i++]; \
-	int dirfd = at_get_fd(s); \
-	\
-	s = argv[i++]; \
-	const char *file = f_get_file(s); \
-	\
-	s = argv[i++]; \
-	int flags = f_get_flags(s); \
-	\
-	s = argv[i++]; \
-	mode_t mode = sscanf_mode_t(s);
-
-#define _LARGEFILE64_SOURCE
-#include "test-skel-0.c"
+#define _FILE_OFFSET_BITS 64
+#include "openat-0.c"

diff --git a/tests/truncate64-0.c b/tests/truncate64-0.c
index 710c8bd..4ec253b 100644
--- a/tests/truncate64-0.c
+++ b/tests/truncate64-0.c
@@ -1,20 +1,3 @@
 #define CONFIG HAVE_TRUNCATE64
-#define FUNC truncate64
-#define SFUNC "truncate64"
-#define FUNC_STR "\"%s\", %llu"
-#define FUNC_IMP path, (unsigned long long)length
-#define ARG_CNT 2
-#define ARG_USE "<path> <length>"
-
-#define process_args() \
-	s = argv[i++]; \
-	char *path = s; \
-	\
-	s = argv[i++]; \
-	off64_t length; \
-	unsigned long long sl; \
-	sscanf(s, "%llu", &sl); \
-	length = sl;
-
-#define _LARGEFILE64_SOURCE
-#include "test-skel-0.c"
+#define _FILE_OFFSET_BITS 64
+#include "truncate-0.c"

diff --git a/tests/utimensat-0.c b/tests/utimensat-0.c
index 4e8b89c..c69f7ea 100644
--- a/tests/utimensat-0.c
+++ b/tests/utimensat-0.c
@@ -1,7 +1,9 @@
 #pragma GCC push_options
 #pragma GCC optimize("-fno-isolate-erroneous-paths-dereference,-fno-isolate-erroneous-paths-attribute")
 
+#ifndef CONFIG
 #define CONFIG HAVE_UTIMENSAT
+#endif
 #define FUNC utimensat
 #define SFUNC "utimensat"
 #define FUNC_STR "%i, \"%s\", %p, %x"

diff --git a/tests/utimensat64-0.c b/tests/utimensat64-0.c
index bbacef5..1351c25 100644
--- a/tests/utimensat64-0.c
+++ b/tests/utimensat64-0.c
@@ -1,3 +1,4 @@
-#define _TIME_BITS 64
+#define CONFIG HAVE___UTIMENSAT64 || HAVE___UTIMENSAT_TIME64
 #define _FILE_OFFSET_BITS 64
+#define _TIME_BITS 64
 #include "utimensat-0.c"


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sandbox:stable-2.x commit in: tests/, /
@ 2025-01-08  4:55 Mike Gilbert
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2025-01-08  4:55 UTC (permalink / raw
  To: gentoo-commits

commit:     149a5fb97abf4a83380c87998562dcabbdc39d5e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  8 04:46:01 2025 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jan  8 04:51:07 2025 +0000
URL:        https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=149a5fb9

tests: move scripts to EXTRA_DIST

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 Makefile.am    |  2 --
 tests/local.mk | 12 +++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 37d9933..14ef729 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,6 @@ confddir = $(sysconfdir)/sandbox.d
 
 bin_PROGRAMS =
 check_PROGRAMS =
-check_SCRIPTS =
-dist_check_SCRIPTS =
 dist_conf_DATA = etc/sandbox.conf
 confd_DATA = etc/sandbox.d/00default
 dist_pkgdata_DATA  = data/sandbox.bashrc

diff --git a/tests/local.mk b/tests/local.mk
index 73900b6..4ba6630 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -13,7 +13,11 @@ EXTRA_DIST += \
 	%D%/package.m4.in \
 	%D%/test-skel-0.c \
 	%D%/tests.h \
-	%D%/xattr-0
+	%D%/malloc-0 \
+	%D%/script-0 \
+	%D%/trace-0 \
+	%D%/xattr-0 \
+	$(wildcard $(top_srcdir)/%D%/*-[0-9]*.sh)
 
 check_PROGRAMS += \
 	%D%/get-group \
@@ -101,12 +105,6 @@ check_PROGRAMS += \
 	%D%/sigsuspend-zsh_static_tst \
 	%D%/trace-memory_static_tst
 
-dist_check_SCRIPTS += \
-	$(wildcard $(top_srcdir)/%D%/*-[0-9]*.sh) \
-	%D%/malloc-0 \
-	%D%/script-0 \
-	%D%/trace-0
-
 # This will be used by all programs, not just tests/ ...
 AM_LDFLAGS = `expr $@ : .*_static >/dev/null && echo -all-static`
 


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-14  4:38 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-08  2:12 [gentoo-commits] proj/sandbox:stable-2.x commit in: tests/, / Mike Gilbert
2025-01-14  4:38 ` [gentoo-commits] proj/sandbox:master " Mike Gilbert
  -- strict thread matches above, loose matches on Subject: below --
2025-01-08  4:55 [gentoo-commits] proj/sandbox:stable-2.x " Mike Gilbert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox