From e65912f8b2a6fa966b1ba45360070cf9f25568b4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 28 Oct 2016 18:43:57 +0200 Subject: rework most tests to work as standalone package --- test/Makefile | 58 ++-------- test/README | 87 --------------- test/Rules.mak | 76 +------------ test/Test.mak | 44 ++------ test/argp/Makefile.in | 2 +- test/args/Makefile.in | 2 +- test/assert/Makefile.in | 2 +- test/crypt/Makefile.in | 9 +- test/crypt/sha256c-test.c | 3 + test/crypt/sha512c-test.c | 3 + test/ctype/Makefile.in | 2 +- test/dlopen/Makefile.in | 5 +- test/inet/Makefile.in | 17 +-- test/librt/Makefile.in | 2 +- test/locale-mbwc/Makefile.in | 3 +- test/locale/Makefile.in | 3 +- test/malloc/Makefile.in | 2 +- test/math/Makefile.in | 8 +- test/misc/Makefile | 2 +- test/misc/Makefile.in | 22 +--- test/mmap/Makefile.in | 2 +- test/nptl/Makefile.in | 80 +++----------- test/nptl/tst-cancel25.c | 4 +- test/nptl/tst-cancel4.c | 2 +- test/nptl/tst-getpid1.c | 7 +- test/nptl/tst-sem11.c | 36 +++++-- test/nptl/tst-signal7.c | 7 +- test/nptl/tst-tls1.c | 14 +-- test/nptl/tst-tls2.c | 14 +-- test/nptl/tst-tls3.c | 2 - test/nptl/tst-tls3mod.c | 2 - test/nptl/tst-tls4.c | 1 - test/nptl/tst-tls4moda.c | 1 - test/nptl/tst-tls4modb.c | 1 - test/nptl/tst-tls5.h | 1 - test/nptl/tst-typesizes.c | 2 +- test/pthread/Makefile.in | 2 +- test/pwd_grp/Makefile.in | 2 +- test/rpc/Makefile.in | 2 +- test/rpc/getrpcent.c | 3 +- test/signal/Makefile.in | 2 +- test/silly/Makefile.in | 19 +--- test/silly/tst-atomic.c | 1 - test/stat/Makefile.in | 2 +- test/stdio/Makefile.in | 2 +- test/stdlib/Makefile.in | 2 +- test/string/Makefile.in | 2 +- test/time/Makefile.in | 2 +- test/tls/Makefile | 2 +- test/tls/Makefile.in | 30 +----- test/tls/tst-tls-at-ctor.c | 1 - test/tls/tst-tls1.c | 2 - test/tls/tst-tls10.c | 2 +- test/tls/tst-tls10.h | 1 - test/tls/tst-tls14.c | 2 - test/tls/tst-tls2.c | 2 - test/tls/tst-tls3.c | 2 - test/tls/tst-tls4.c | 2 - test/tls/tst-tls5.c | 2 - test/tls/tst-tls6.c | 7 -- test/tls/tst-tls7.c | 7 -- test/tls/tst-tls8.c | 7 -- test/tls/tst-tls9.c | 2 - test/tls/tst-tlsmod-at-ctor.c | 1 - test/tls/tst-tlsmod1.c | 2 - test/tls/tst-tlsmod13.c | 2 - test/tls/tst-tlsmod13a.c | 2 - test/tls/tst-tlsmod14a.c | 2 - test/tls/tst-tlsmod16a.c | 2 - test/tls/tst-tlsmod16b.c | 2 - test/tls/tst-tlsmod2.c | 2 - test/tls/tst-tlsmod3.c | 2 - test/tls/tst-tlsmod4.c | 2 - test/tls/tst-tlsmod5.c | 2 - test/tls/tst-tlsmod6.c | 2 - test/unistd/Makefile.in | 10 +- test/unistd/tst-getconf.sh | 240 ------------------------------------------ 77 files changed, 116 insertions(+), 797 deletions(-) delete mode 100644 test/README delete mode 100755 test/unistd/tst-getconf.sh diff --git a/test/Makefile b/test/Makefile index 532a43a..3044d7b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,9 +1,5 @@ -# Makefile for uClibc -# -# Copyright (C) 2000-2005 Erik Andersen -# +# Makefile for uClibc-ng-test # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# top_srcdir=../ top_builddir=../ @@ -12,41 +8,9 @@ include Rules.mak ALL_SUBDIRS := $(patsubst %/Makefile,%,$(wildcard */Makefile)) DIRS := $(ALL_SUBDIRS) -ifneq ($(HAVE_SHARED)$(UCLIBC_HAS_THREADS),yy) - DIRS := $(filter-out dlopen,$(DIRS)) -endif -ifneq ($(findstring -static,$(LDFLAGS)),) - DIRS := $(filter-out dlopen,$(DIRS)) -endif -ifneq ($(UCLIBC_HAS_THREADS)$(ARCH_USE_MMU),yy) - DIRS := $(filter-out pthread,$(DIRS)) -endif -ifneq ($(UCLIBC_HAS_FLOATS),y) - DIRS := $(filter-out math,$(DIRS)) -endif -ifneq ($(UCLIBC_HAS_FULL_RPC),y) - DIRS := $(filter-out rpc,$(DIRS)) -endif -ifneq ($(UCLIBC_HAS_REGEX),y) - DIRS := $(filter-out regex,$(DIRS)) -endif -ifneq ($(HAVE_SHARED)$(UCLIBC_HAS_THREADS_NATIVE),yy) - DIRS := $(filter-out tls nptl,$(DIRS)) -endif -ifneq ($(UCLIBC_HAS_WCHAR),y) - DIRS := $(filter-out locale-mbwc,$(DIRS)) -endif -ifneq ($(UCLIBC_HAS_LOCALE),y) - DIRS := $(filter-out locale,$(DIRS)) -endif -ifneq ($(UCLIBC_HAS_CRYPT_IMPL),y) - DIRS := $(filter-out crypt,$(DIRS)) -endif -ifeq ($(HAS_NO_THREADS),y) - DIRS := $(filter-out pthread,$(DIRS)) -endif -ifneq ($(UCLIBC_HAS_ARGP),y) - DIRS := $(filter-out argp,$(DIRS)) + +ifeq ($(NO_LOCALE),1) +DIRS := $(filter-out locale,$(DIRS)) endif test check all: run @@ -57,13 +21,7 @@ gen: -rm -f $(top_builddir)/test/uclibcng-testrunner.in $(MAKE) run UCLIBCNG_GENERATE_TESTRUNNER=1 -compile: $(top_builddir)$(LOCAL_INSTALL_PATH) subdirs_compile - -$(top_builddir)$(LOCAL_INSTALL_PATH): - $(Q)$(MAKE) -C $(top_builddir) $(LOCAL_INSTALL_PATH) - -tags: - ctags -R +compile: subdirs_compile clean: subdirs_clean @@ -78,12 +36,10 @@ $(patsubst %, _dir_%, $(DIRS)) : dummy $(patsubst %, _dirrun_%, $(DIRS)) : dummy $(Q)$(MAKE) -C $(patsubst _dirrun_%, %, $@) run \ - UCLIBCNG_TEST_SUBDIR=$(strip $(patsubst _dirrun_%, %, $@)) \ - KCONFIG_CONFIG=$(KCONFIG_CONFIG) + UCLIBCNG_TEST_SUBDIR=$(strip $(patsubst _dirrun_%, %, $@)) $(patsubst %, _dircompile_%, $(DIRS)) : dummy - $(Q)$(MAKE) -C $(patsubst _dircompile_%, %, $@) compile \ - KCONFIG_CONFIG=$(KCONFIG_CONFIG) + $(Q)$(MAKE) -C $(patsubst _dircompile_%, %, $@) compile $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy $(Q)$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean diff --git a/test/README b/test/README deleted file mode 100644 index 723ce6e..0000000 --- a/test/README +++ /dev/null @@ -1,87 +0,0 @@ ------------ - For: User ------------ -Following make targets are avaialable - -make compile - -This will compile and link the tests. - -make run - -This will execute all the tests. - -make check -make all - -This will build and run tests. - -The following make variables may help you in testing: - - - UCLIBC_ONLY - only run tests against uClibc - - GLIBC_ONLY - only run tests against glibc - - V / VERBOSE - run tests with a lot of output - - TEST_INSTALLED_UCLIBC - Test installed libraries - under /lib and /usr/lib. - - TIMEOUTFACTOR=nn - increase test timeout nn times. - At least REGEX_OLD + regex/tst-regex2 needs it increased. - -So, to just run the uClibc tests, try this: -make check UCLIBC_ONLY=1 - -You can pass the following 2 environment variables to "make run": - - make run SIMULATOR_uclibc=qemu-sh4 SIMULATOR_glibc=qemu-x86_64 - -If you need to test just a subset of all test, delete subdirectories -you do not need. - -As of 2009-07, build machinery does not track dependencies on uclibc. -If you edit a header and re-run "make compile", it does not re-install it -into ../install_dir. If you delete ../install_dir, "make compile" -rebuilds uclibc as needed and re-installs ../install_dir, -but still does not rebuild testcases. -(You can work around it by "touch */*.c" for now). - ----------------- - For: Developer ----------------- - -The structure of this test system is: - test/ toplevel dir containing common test code - test/Rules.mak Common build code - test/Test.mak Runtime test make code - test/subdir/ code specific to a subsystem is stored in a subdir - test/subdir/Makefile.in describe the tests to run - test/subdir/Makefile test entry point, includes needed upper-level - makefiles plus Makefile.in - test/subdir/*.c the tests - -Each subdir has a Makefile (same for any subdir) that must include in strict order: - - the upper-level Rules.mak file - - the Makefile.in - - the upper-level Test.mak file -Makefile.in may be used to define the TESTS and TESTS_DISABLED variables. -If you do not, TESTS is built automatically based upon all the .c files in the subdir. -TESTS := foo -TESTS_DISABLED := bar -Each test must use a similar .c name; so the "foo" test needs a "foo.c". - -Additionally, the following options further control specific test behavior: -CFLAGS_foo := extra cflags to use to compile test -DODIFF_foo := compare the output of the glibc and uClibc tests (see below) -LDFLAGS_foo := extra ldflags to use to link test -OPTS_foo := extra options to pass to test -RET_foo := expected exit code of test; default is 0 -WRAPPER_foo := execute stuff just before test - -Or to control all tests in a subdir: -EXTRA_CLEAN := extra files to remove in the clean target -EXTRA_DIRS := extra directories to remove in the clean target -EXTRA_CFLAGS := -DFOO -EXTRA_LDFLAGS := -lpthread -OPTS := -WRAPPER := - -If you want to compare the output of a test with known good output, then just -create a local file named "foo.out.good" and the output generated by the test -"foo" will be automatically stored in "foo.out" and compared to "foo.out.good". diff --git a/test/Rules.mak b/test/Rules.mak index 9416a0c..b9dabbd 100644 --- a/test/Rules.mak +++ b/test/Rules.mak @@ -1,9 +1,5 @@ -# Rules.mak for uClibc test subdirs -# -# Copyright (C) 2000-2006 Erik Andersen -# +# Rules.mak for uClibc-ng-test subdirs # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# .SUFFIXES: @@ -13,30 +9,7 @@ abs_top_builddir ?= $(shell cd $(top_builddir); pwd)/ TESTDIR=$(top_builddir)test/ include $(top_srcdir)Rules.mak -ifeq ($(filter $(clean_targets) CLEAN_%,$(MAKECMDGOALS)),) -ifeq ($(HAVE_DOT_CONFIG),) -$(error no HAVE_DOT_CONFIG, failed to read .config) -endif -endif -ifdef UCLIBC_LDSO -ifeq (,$(findstring /,$(UCLIBC_LDSO))) -UCLIBC_LDSO := $(UCLIBC_LDSO) -else -UCLIBC_LDSO := $(notdir $(UCLIBC_LDSO)) -endif -else -UCLIBC_LDSO := $(notdir $(firstword $(wildcard $(top_builddir)lib/ld*))) -endif -ifndef TEST_INSTALLED_UCLIBC -ifeq ($(LDSO_SAFE_RUNPATH),y) -UCLIBC_PATH := $(abs_top_builddir)lib -else -UCLIBC_PATH := $(top_builddir)lib -endif -else -UCLIBC_PATH := $(RUNTIME_PREFIX)$(MULTILIB_DIR) -endif #-------------------------------------------------------- # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. LC_ALL:= C @@ -61,20 +34,10 @@ export TARGET_ARCH RM_R = $(Q)$(RM) -r LN_S = $(Q)$(LN) -fs -ifneq ($(KERNEL_HEADERS),) -ifeq ($(patsubst /%,/,$(KERNEL_HEADERS)),/) -# Absolute path in KERNEL_HEADERS -KERNEL_INCLUDES += -I$(KERNEL_HEADERS) -else -# Relative path in KERNEL_HEADERS -KERNEL_INCLUDES += -I$(top_builddir)$(KERNEL_HEADERS) -endif -endif - XCOMMON_CFLAGS := -I$(top_builddir)test -D_GNU_SOURCE XWARNINGS += $(CFLAG_-Wstrict-prototypes) -CFLAGS := -nostdinc -I$(top_builddir)$(LOCAL_INSTALL_PATH)/usr/include -CFLAGS += $(XCOMMON_CFLAGS) $(KERNEL_INCLUDES) $(CC_INC) +CFLAGS ?= +CFLAGS += $(XCOMMON_CFLAGS) CFLAGS += $(OPTIMIZATION) $(CPU_CFLAGS) $(XWARNINGS) $(eval $(call check-gcc-var,-Wno-missing-field-initializers)) @@ -84,37 +47,8 @@ CFLAGS += $(CFLAG_-Wno-missing-field-initializers) # Just adding -Os for now. HOST_CFLAGS += $(XCOMMON_CFLAGS) -Os $(XWARNINGS) -std=gnu99 -LDFLAGS := $(CPU_LDFLAGS-y) -Wl,-z,now -ifeq ($(DODEBUG),y) - CFLAGS += -g - HOST_CFLAGS += -g - LDFLAGS += -Wl,-g - HOST_LDFLAGS += -Wl,-g -endif - -ifeq ($(DOSTRIP),y) - LDFLAGS += -Wl,-s - HOST_LDFLAGS += -Wl,-s -endif - -ifneq ($(HAVE_SHARED),y) - LDFLAGS += -Wl,-static -static-libgcc -endif - -ifndef TEST_INSTALLED_UCLIBC -LDFLAGS += -B$(UCLIBC_PATH) -Wl,-rpath,$(UCLIBC_PATH):$(shell pwd) -Wl,-rpath-link,$(UCLIBC_PATH):$(shell pwd) -else -LDFLAGS += -Wl,-rpath,$(shell pwd) -endif - -ifeq ($(findstring -static,$(LDFLAGS)),) -LDFLAGS += -Wl,--dynamic-linker,$(UCLIBC_PATH)/$(UCLIBC_LDSO) -endif - -ifeq ($(LDSO_GNU_HASH_SUPPORT),y) -# Check for binutils support is done on root Rules.mak -LDFLAGS += $(CFLAG_-Wl--hash-style=gnu) -endif +#LDFLAGS := $(CPU_LDFLAGS-y) -Wl,-z,now +#LDFLAGS += -Wl,-rpath,$(shell pwd) ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"") CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS)) diff --git a/test/Test.mak b/test/Test.mak index c9b1f5a..14ccb7f 100644 --- a/test/Test.mak +++ b/test/Test.mak @@ -1,7 +1,4 @@ # Common makefile rules for tests -# -# Copyright (C) 2000-2006 Erik Andersen -# # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. shellescape='$(subst ','\'',$(1))' @@ -20,29 +17,16 @@ ifneq ($(filter-out test,$(strip $(TESTS))),$(strip $(TESTS))) $(error Sanity check: cannot have a test named "test.c") endif -U_TARGETS := $(TESTS) -G_TARGETS := $(addsuffix _glibc,$(U_TARGETS)) +TARGETS := $(TESTS) -ifneq ($(GLIBC_TESTS_DISABLED),) -G_TARGETS := $(filter-out $(GLIBC_TESTS_DISABLED),$(G_TARGETS)) -endif - -ifeq ($(GLIBC_ONLY),) -TARGETS += $(U_TARGETS) -endif -ifeq ($(UCLIBC_ONLY),) -TARGETS += $(G_TARGETS) -endif - -CLEAN_TARGETS := $(U_TARGETS) $(G_TARGETS) -CLEAN_TARGETS += $(TESTS_DISABLED) $(addsuffix _glibc,$(TESTS_DISABLED)) $(GLIBC_TESTS_DISABLED) +CLEAN_TARGETS := $(TARGETS) +CLEAN_TARGETS += $(TESTS_DISABLED) COMPILE_TARGETS := $(TARGETS) # We sort the targets so uClibc and host-libc tests are run adjacent RUN_TARGETS := $(sort $(addsuffix .exe,$(TARGETS))) COMPILE_TARGETS := $(sort $(COMPILE_TARGETS)) # provide build rules even for disabled tests: -U_TARGETS += $(TESTS_DISABLED) -G_TARGETS += $(addsuffix _glibc,$(TESTS_DISABLED)) $(GLIBC_TESTS_DISABLED) +TARGETS += $(TESTS_DISABLED) TARGETS += $(SHELL_TESTS) CFLAGS += $(CFLAGS_$(notdir $(CURDIR))) ifeq (1,$(UCLIBCNG_GENERATE_TESTRUNNER)) @@ -91,8 +75,7 @@ endef test check all: run run: $(RUN_TARGETS) -$(addsuffix .exe,$(U_TARGETS)): SIMULATOR:=$(SIMULATOR_uclibc) -$(addsuffix .exe,$(G_TARGETS)): SIMULATOR:=$(SIMULATOR_glibc) +$(addsuffix .exe,$(TARGETS)): SIMULATOR:=$(SIMULATOR) $(RUN_TARGETS): ifeq (1,$(UCLIBCNG_GENERATE_TESTRUNNER)) $(Q)\ @@ -106,32 +89,19 @@ ifeq (1,$(UCLIBCNG_GENERATE_TESTRUNNER)) else $(exec_test) $(diff_test) -ifeq ($(UCLIBC_ONLY),) - $(uclibc_glibc_diff_test) -endif endif compile: $(COMPILE_TARGETS) -G_TARGET_SRCS := $(addsuffix .c,$(G_TARGETS)) -U_TARGET_SRCS := $(addsuffix .c,$(U_TARGETS)) +TARGET_SRCS := $(addsuffix .c,$(TARGETS)) MAKE_SRCS := $(wildcard Makefile.in) $(TESTDIR)Makefile $(TESTDIR)Rules.mak $(TESTDIR)Test.mak -$(U_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS) +$(TARGETS): $(TARGET_SRCS) $(MAKE_SRCS) $(showlink) $(Q)$(CC) $(filter-out $(CFLAGS-OMIT-$@),$(CFLAGS)) $(EXTRA_CFLAGS) $(CFLAGS_$(notdir $(CURDIR))) $(CFLAGS_$@) -c $@.c -o $@.o $(Q)$(CC) $(filter-out $(LDFLAGS-OMIT-$@),$(LDFLAGS)) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$@) -$(G_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS) - $(showlink) - $(Q)$(HOSTCC) $(filter-out $(HOST_CFLAGS-OMIT-$(patsubst %_glibc,%,$@)),$(HOST_CFLAGS)) \ - $(CFLAGS_$(notdir $(CURDIR))) $(CFLAGS_$(patsubst %_glibc,%,$@)) \ - -c $(patsubst %_glibc,%,$@).c -o $@.o - $(Q)$(HOSTCC) $(filter-out $(LDFLAGS-OMIT-$(patsubst %_glibc,%,$@)),$(HOST_LDFLAGS)) \ - $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$(patsubst %_glibc,%,$@)) $(LDFLAGS_$@) - - shell_%: $(showtest) $(Q)$(if $(PRE_RUN_$(@)),$(PRE_RUN_$(@))) diff --git a/test/argp/Makefile.in b/test/argp/Makefile.in index c472964..e490076 100644 --- a/test/argp/Makefile.in +++ b/test/argp/Makefile.in @@ -1,4 +1,4 @@ -# uClibc argp tests +# uClibc-ng argp tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. TESTS := $(addprefix argp-, ex1 ex2 ex3 ex4 test) \ diff --git a/test/args/Makefile.in b/test/args/Makefile.in index f4edab4..cc5a56c 100644 --- a/test/args/Makefile.in +++ b/test/args/Makefile.in @@ -1,4 +1,4 @@ -# uClibc args tests +# uClibc-ng args tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. OPTS_arg_test = a b c d e f g h diff --git a/test/assert/Makefile.in b/test/assert/Makefile.in index 8e3514f..c0d5687 100644 --- a/test/assert/Makefile.in +++ b/test/assert/Makefile.in @@ -1,4 +1,4 @@ -# uClibc assert tests +# uClibc-ng assert tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. RET_assert := 134 diff --git a/test/crypt/Makefile.in b/test/crypt/Makefile.in index f852219..28aeb54 100644 --- a/test/crypt/Makefile.in +++ b/test/crypt/Makefile.in @@ -1,15 +1,8 @@ -# uClibc crypt tests +# uClibc-ng crypt tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. EXTRA_LDFLAGS := -lcrypt OPTS_crypt = < crypt.input -ifneq ($(UCLIBC_HAS_SHA512_CRYPT_IMPL),y) -TESTS_DISABLED += sha512c-test -endif -ifneq ($(UCLIBC_HAS_SHA256_CRYPT_IMPL),y) -TESTS_DISABLED += sha256c-test -endif - WRAPPER := env TIMEOUTFACTOR=50 diff --git a/test/crypt/sha256c-test.c b/test/crypt/sha256c-test.c index 357f0d8..5334cc8 100644 --- a/test/crypt/sha256c-test.c +++ b/test/crypt/sha256c-test.c @@ -40,6 +40,8 @@ static int do_test (void) { int result = 0; + +#if __UCLIBC_HAS_SHA256_CRYPT_IMPL__ int i; for (i = 0; i < ntests; ++i) @@ -53,6 +55,7 @@ do_test (void) result = 1; } } +#endif return result; } diff --git a/test/crypt/sha512c-test.c b/test/crypt/sha512c-test.c index c829242..be55b59 100644 --- a/test/crypt/sha512c-test.c +++ b/test/crypt/sha512c-test.c @@ -41,6 +41,8 @@ static int do_test (void) { int result = 0; + +#if __UCLIBC_HAS_SHA512_CRYPT_IMPL__ int i; for (i = 0; i < ntests; ++i) @@ -54,6 +56,7 @@ do_test (void) result = 1; } } +#endif return result; } diff --git a/test/ctype/Makefile.in b/test/ctype/Makefile.in index ee10d59..e5e26b8 100644 --- a/test/ctype/Makefile.in +++ b/test/ctype/Makefile.in @@ -1,4 +1,4 @@ -# uClibc ctype tests +# uClibc-ng ctype tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. TESTS := ctype diff --git a/test/dlopen/Makefile.in b/test/dlopen/Makefile.in index 740453a..f947adc 100644 --- a/test/dlopen/Makefile.in +++ b/test/dlopen/Makefile.in @@ -1,9 +1,6 @@ -# uClibc dlopen tests +# uClibc-ng dlopen tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# rules need a little love to work with glibc ... -export UCLIBC_ONLY := 1 - TESTS := dltest dltest2 dlstatic test1 test2 test3 dlundef dlafk dladdr \ testscope nodelete nodelete1 tst-origin diff --git a/test/inet/Makefile.in b/test/inet/Makefile.in index 31a4837..a79b3d3 100644 --- a/test/inet/Makefile.in +++ b/test/inet/Makefile.in @@ -1,17 +1,2 @@ -# uClibc inet tests +# uClibc-ng inet tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# -ifeq ($(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6),) -TESTS_DISABLED := bug-if1 gethost_r-align gethostid if_nameindex tst-aton \ - tst-network tst-ntoa test-ifaddrs -endif - -ifeq ($(UCLIBC_HAS_SOCKET)$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6),) -TESTS_DISABLED += tst-ether_aton tst-ethers tst-ethers-line -endif - -ifeq ($(UCLIBC_HAS_RESOLVER_SUPPORT),) -TESTS_DISABLED += tst-res -else -LDFLAGS_tst-res_glibc := -lresolv # assume it's glibc or somebody with that lib -endif diff --git a/test/librt/Makefile.in b/test/librt/Makefile.in index f25522c..b2a829d 100644 --- a/test/librt/Makefile.in +++ b/test/librt/Makefile.in @@ -1,4 +1,4 @@ -# uClibc shm tests +# uClibc-ng shm tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. LDFLAGS_shmtest := -lrt diff --git a/test/locale-mbwc/Makefile.in b/test/locale-mbwc/Makefile.in index 6c0d894..af208e1 100644 --- a/test/locale-mbwc/Makefile.in +++ b/test/locale-mbwc/Makefile.in @@ -1,6 +1,5 @@ -# uClibc locale tests +# uClibc-ng locale tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# tst_mbtowc tst_strcoll tst_strfmon tst_strxfrm \ TESTS := tst_iswalnum tst_iswalpha tst_iswcntrl \ tst_iswctype tst_iswdigit tst_iswgraph \ diff --git a/test/locale/Makefile.in b/test/locale/Makefile.in index 5a57ca5..ab1bcfe 100644 --- a/test/locale/Makefile.in +++ b/test/locale/Makefile.in @@ -1,6 +1,5 @@ -# uClibc locale tests +# uClibc-ng locale tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# tst_mbtowc tst_strcoll tst_strfmon tst_strxfrm \ TESTS := bug-iconv-trans bug-usesetlocale collate-test dump-ctype \ gen-unicode-ctype show-ucs-data tst-ctype \ diff --git a/test/malloc/Makefile.in b/test/malloc/Makefile.in index 875a849..ca8493a 100644 --- a/test/malloc/Makefile.in +++ b/test/malloc/Makefile.in @@ -1,4 +1,4 @@ -# uClibc malloc tests +# uClibc-ng malloc tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. TESTS_DISABLED := time_malloc diff --git a/test/math/Makefile.in b/test/math/Makefile.in index 3874001..3e60445 100644 --- a/test/math/Makefile.in +++ b/test/math/Makefile.in @@ -1,4 +1,4 @@ -# uClibc math tests +# uClibc-ng math tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # libm-test.c is a generated file used by the tests internally so skip it @@ -10,12 +10,6 @@ ifeq ($(UCLIBC_HAS_LONG_DOUBLE_MATH),) TESTS_DISABLED += test-ldouble test-ildoubl compile_test c99_test CFLAGS_basic-test := -DNO_LONG_DOUBLE endif -ifeq ($(DO_C99_MATH),) -TESTS_DISABLED += test-float test-ifloat test-double test-idouble rint signgam ilogb -endif -ifeq ($(UCLIBC_HAS_FPU),) -TESTS_DISABLED += test-fpucw -endif DODIFF_rint := 1 DODIFF_signgam := 1 diff --git a/test/misc/Makefile b/test/misc/Makefile index 09fa233..d3b4835 100644 --- a/test/misc/Makefile +++ b/test/misc/Makefile @@ -1,4 +1,4 @@ -# uClibc misc tests +# uClibc-ng misc tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ diff --git a/test/misc/Makefile.in b/test/misc/Makefile.in index 7d7bb10..9788697 100644 --- a/test/misc/Makefile.in +++ b/test/misc/Makefile.in @@ -1,4 +1,4 @@ -# uClibc misc tests +# uClibc-ng misc tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. TESTS_DISABLED := outb tst-fnmatch bug-glob1 tst-gnuglob @@ -7,28 +7,8 @@ ifeq ($(TARGET_avr32),y) TESTS_DISABLED += tst-inotify endif -ifeq ($(UCLIBC_HAS_LFS),) -TESTS_DISABLED += dirent64 -TESTS_DISABLED += tst-statfs # assuming host has LFS on -endif CFLAGS_dirent64 := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -ifeq ($(UCLIBC_LINUX_SPECIFIC),) -TESTS_DISABLED += tst-inotify -endif - -ifeq ($(UCLIBC_HAS_GLOB),) -TESTS_DISABLED += bug-glob2 -endif - -ifeq ($(UCLIBC_HAS_UTMPX),) -TESTS_DISABLED += tst-utmpx -endif - -ifeq ($(UCLIBC_HAS_UTMP),) -TESTS_DISABLED += tst-utmp -endif - DODIFF_dirent := 1 DODIFF_dirent64 := 1 DODIFF_tst-statfs := 1 diff --git a/test/mmap/Makefile.in b/test/mmap/Makefile.in index 581f3b0..b15ea82 100644 --- a/test/mmap/Makefile.in +++ b/test/mmap/Makefile.in @@ -1,2 +1,2 @@ -# uClibc mmap tests +# uClibc-ng mmap tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in index 9a3b104..341f909 100644 --- a/test/nptl/Makefile.in +++ b/test/nptl/Makefile.in @@ -1,4 +1,4 @@ -# uClibc NPTL tests +# uClibc-ng NPTL tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. TESTS := tst-align tst-align2 tst-atfork1 tst-attr1 tst-attr2 tst-attr3 \ @@ -41,7 +41,7 @@ TESTS := tst-align tst-align2 tst-atfork1 tst-attr1 tst-attr2 tst-attr3 \ tst-getpid1 tst-getpid2 tst-getpid3 tst-join6 tst-tsd6 \ tst-oddstacklimit tst-oncex3 tst-oncex4 tst-rwlock2a \ tst-basic7 tst-signal7 tst-vfork1x tst-vfork2x tst-sem10 tst-sem11 \ - tst-sem12 tst-typesizes tst-initializers1-c89 tst-initializers1-c99 \ + tst-sem12 tst-initializers1-c89 tst-initializers1-c99 \ tst-initializers1-gnu89 tst-initializers1-gnu99 \ tst-atfork2 @@ -54,33 +54,6 @@ TESTS += tst-clock tst-clock_nanosleep tst-cpuclock1 tst-cpuclock2 \ tst-mqueue7 tst-mqueue8 tst-mqueue9 tst-timer2 tst-timer3 \ tst-timer4 tst-timer5 -ifeq ($(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),) -TESTS_DISABLED += tst-exec2 tst-exec3 tst-exec4 -endif - -ifeq ($(UCLIBC_SUSV4_LEGACY),) -TESTS_DISABLED += tst-basic5 tst-cancel4 tst-cancel5 tst-cancelx4 -endif - -GLIBC_TESTS_DISABLED := tst-eintr1_glibc tst-eintr2_glibc \ - tst-eintr3_glibc tst-eintr4_glibc tst-eintr5_glibc \ - tst-tls1_glibc tst-tls2_glibc - - -ifeq ($(HAVE_SHARED),) -TESTS_DISABLED += tst-tls3 tst-tls4 tst-tls5 tst-dlsym1 tst-fini1 \ - tst-unload -else -GLIBC_TESTS_DISABLED += tst-tls3_glibc tst-tls4_glibc tst-tls5_glibc -endif - -EXTRA_CFLAGS := -DNOT_IN_libc=1 -D_LIBC -D__USE_GNU -std=gnu99 \ - $(PTINC) \ - -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) \ - -I$(top_srcdir)libc/sysdeps/linux \ - -I$(top_builddir)include \ - -include $(top_builddir)include/libc-symbols.h - ifeq ($(TARGET_ARCH),i386) CFLAGS_tst-align := -malign-double -mpreferred-stack-boundary=4 endif @@ -89,45 +62,21 @@ CFLAGS_tst-align := -malign-double -mpreferred-stack-boundary=4 -msse endif CFLAGS_tst-cleanup4aux.o := -W CFLAGS_tst-initializers1 := -W -Werror -CFLAGS_tst-tls3mod.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc -CFLAGS_tst-tls4moda.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc -CFLAGS_tst-tls4modb.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc -CFLAGS_tst-tls5mod.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc -CFLAGS_tst-tls5moda.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc -CFLAGS_tst-tls5modb.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc -CFLAGS_tst-tls5modc.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc -CFLAGS_tst-tls5modd.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc -CFLAGS_tst-tls5mode.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc -CFLAGS_tst-tls5modf.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc - -CFLAGS_tst-fini1mod.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc +CFLAGS_tst-tls3mod.so := -fPIC -DPIC -DSHARED -shared +CFLAGS_tst-tls4moda.so := -fPIC -DPIC -DSHARED -shared +CFLAGS_tst-tls4modb.so := -fPIC -DPIC -DSHARED -shared +CFLAGS_tst-tls5mod.so := -fPIC -DPIC -DSHARED -shared +CFLAGS_tst-tls5moda.so := -fPIC -DPIC -DSHARED -shared +CFLAGS_tst-tls5modb.so := -fPIC -DPIC -DSHARED -shared +CFLAGS_tst-tls5modc.so := -fPIC -DPIC -DSHARED -shared +CFLAGS_tst-tls5modd.so := -fPIC -DPIC -DSHARED -shared +CFLAGS_tst-tls5mode.so := -fPIC -DPIC -DSHARED -shared +CFLAGS_tst-tls5modf.so := -fPIC -DPIC -DSHARED -shared + +CFLAGS_tst-fini1mod.so := -fPIC -DPIC -DSHARED -shared LDFLAGS_tst-cond11 = -lrt LDFLAGS_tst-cond19 = -lrt -LDFLAGS_tst-cancelx2 = -lc -LDFLAGS_tst-cancelx3 = -lc -LDFLAGS_tst-cancelx4 = -lc -LDFLAGS_tst-cancelx6 = -lc -LDFLAGS_tst-cancelx6 = -lc -LDFLAGS_tst-cancelx7 = -lc -LDFLAGS_tst-cancelx8 = -lc -LDFLAGS_tst-cancelx9 = -lc -LDFLAGS_tst-cancelx10 = -lc -LDFLAGS_tst-cancelx11 = -lc -LDFLAGS_tst-cancelx12 = -lc -LDFLAGS_tst-cancelx13 = -lc -LDFLAGS_tst-cancelx14 = -lc -LDFLAGS_tst-cancelx15 = -lc -LDFLAGS_tst-cancelx16 = -lc -LDFLAGS_tst-cancelx18 = -lc -LDFLAGS_tst-cancelx20 = -lc -LDFLAGS_tst-cancelx21 = -lc -LDFLAGS_tst-cleanupx0 = -lc -LDFLAGS_tst-cleanupx1 = -lc -LDFLAGS_tst-cleanupx2 = -lc -LDFLAGS_tst-cleanupx3 = -lc -LDFLAGS_tst-oncex3 = -lc -LDFLAGS_tst-oncex4 = -lc LDFLAGS_tst-rwlock14 = -lrt LDFLAGS_tst-fini1 = -Wl,-rpath=./ tst-fini1mod.so LDFLAGS_tst-fini1mod.so = -Wl,-soname=tst-fini1mod.so @@ -233,7 +182,6 @@ tst-cleanupx4 : tst-cleanup4aux.o tst-fini1: tst-fini1mod.so tst-atfork2: tst-atfork2mod.so -tst-atfork2_glibc: tst-atfork2mod.so.glibc OPTS_tst-cancel7 = -c ./tst-cancel7 OPTS_tst-mqueue7 = -- ./tst-mqueue7 diff --git a/test/nptl/tst-cancel25.c b/test/nptl/tst-cancel25.c index 00b99ad..c724d8a 100644 --- a/test/nptl/tst-cancel25.c +++ b/test/nptl/tst-cancel25.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -11,6 +11,7 @@ static pthread_t th2; static void * tf2 (void *arg) { +#ifdef SIGCANCEL sigset_t mask; if (pthread_sigmask (SIG_SETMASK, NULL, &mask) != 0) { @@ -22,6 +23,7 @@ tf2 (void *arg) puts ("SIGCANCEL blocked in new thread"); exit (1); } +#endif /* Sync with the main thread so that we do not test anything else. */ int e = pthread_barrier_wait (&b); diff --git a/test/nptl/tst-cancel4.c b/test/nptl/tst-cancel4.c index ecaf297..696a527 100644 --- a/test/nptl/tst-cancel4.c +++ b/test/nptl/tst-cancel4.c @@ -38,7 +38,7 @@ #include #include -#include "pthreadP.h" +#define SIGCANCEL __SIGRTMIN /* Since STREAMS are not supported in the standard Linux kernel and diff --git a/test/nptl/tst-getpid1.c b/test/nptl/tst-getpid1.c index 4d25b0d..a4ab8ca 100644 --- a/test/nptl/tst-getpid1.c +++ b/test/nptl/tst-getpid1.c @@ -5,7 +5,12 @@ #include #include #include -#include + +#if defined(__hppa__) +#define _STACK_GROWS_UP 1 +#else +#define _STACK_GROWS_DOWN 1 +#endif #ifndef TEST_CLONE_FLAGS #define TEST_CLONE_FLAGS 0 diff --git a/test/nptl/tst-sem11.c b/test/nptl/tst-sem11.c index 6633ddd..a9c616c 100644 --- a/test/nptl/tst-sem11.c +++ b/test/nptl/tst-sem11.c @@ -2,7 +2,14 @@ #include #include #include -#include + +//from internaltypes.h +struct new_sem +{ + unsigned int value; + int private; + unsigned long int nwaiters; +}; #ifndef SEM_WAIT # define SEM_WAIT(s) sem_wait (s) @@ -23,23 +30,28 @@ main (void) { int tries = 5; pthread_t th; - sem_t s; + union + { + sem_t s; + struct new_sem ns; + } u; again: - if (sem_init (&s, 0, 0) != 0) + if (sem_init (&u.s, 0, 0) != 0) { puts ("sem_init failed"); return 1; } - - struct new_sem *is = (struct new_sem *) &s; - - if (is->nwaiters != 0) +#if __HAVE_64B_ATOMICS + if ((u.ns.data >> SEM_NWAITERS_SHIFT) != 0) +#else + if (u.ns.nwaiters != 0) +#endif { puts ("nwaiters not initialized"); return 1; } - if (pthread_create (&th, NULL, tf, &s) != 0) + if (pthread_create (&th, NULL, tf, &u.s) != 0) { puts ("pthread_create failed"); return 1; @@ -62,11 +74,15 @@ main (void) if (r != PTHREAD_CANCELED && --tries > 0) { /* Maybe we get the scheduling right the next time. */ - sem_destroy (&s); + sem_destroy (&u.s); goto again; } - if (is->nwaiters != 0) +#if __HAVE_64B_ATOMICS + if ((u.ns.data >> SEM_NWAITERS_SHIFT) != 0) +#else + if (u.ns.nwaiters != 0) +#endif { puts ("nwaiters not reset"); return 1; diff --git a/test/nptl/tst-signal7.c b/test/nptl/tst-signal7.c index 629f377..a635fcd 100644 --- a/test/nptl/tst-signal7.c +++ b/test/nptl/tst-signal7.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2005. @@ -17,7 +17,6 @@ . */ #include -#include #include #include @@ -27,6 +26,7 @@ do_test (void) { int result = 0; +#ifdef SIGCANCEL errno = 0; if (sigaction (SIGCANCEL, NULL, NULL) == 0) { @@ -38,7 +38,9 @@ do_test (void) puts ("sigaction(SIGCANCEL) did not set errno to EINVAL"); result = 1; } +#endif +#ifdef SIGSETXID errno = 0; if (sigaction (SIGSETXID, NULL, NULL) == 0) { @@ -50,6 +52,7 @@ do_test (void) puts ("sigaction(SIGSETXID) did not set errno to EINVAL"); result = 1; } +#endif return result; } diff --git a/test/nptl/tst-tls1.c b/test/nptl/tst-tls1.c index a7cf8f4..9eadf66 100644 --- a/test/nptl/tst-tls1.c +++ b/test/nptl/tst-tls1.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2003-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2003. @@ -19,9 +19,8 @@ #include #include #include -#include -#if HAVE___THREAD + struct test_s { int a; @@ -51,19 +50,11 @@ tf (void *arg) return NULL; } -#endif int do_test (void) { -#if !HAVE___THREAD - - puts ("No __thread support in compiler, test skipped."); - - return 0; -#else - if (s.a != INIT_A || s.b != INIT_B) { puts ("initial value of s in main thread wrong"); @@ -113,7 +104,6 @@ do_test (void) } return 0; -#endif } diff --git a/test/nptl/tst-tls2.c b/test/nptl/tst-tls2.c index f60f4a5..eb6d8a3 100644 --- a/test/nptl/tst-tls2.c +++ b/test/nptl/tst-tls2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2003-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2003. @@ -23,9 +23,7 @@ #include #include #include -#include -#if HAVE___THREAD #define N 10 static pthread_t th[N]; @@ -106,18 +104,11 @@ tf (void *arg) return NULL; } -#endif + int do_test (void) { -#if !HAVE___THREAD - - puts ("No __thread support in compiler, test skipped."); - - return 0; -#else - if (pthread_barrier_init (&b, NULL, N + 1) != 0) { puts ("barrier_init failed"); @@ -207,7 +198,6 @@ do_test (void) } return 0; -#endif } diff --git a/test/nptl/tst-tls3.c b/test/nptl/tst-tls3.c index 0d4e514..3d92d91 100644 --- a/test/nptl/tst-tls3.c +++ b/test/nptl/tst-tls3.c @@ -25,8 +25,6 @@ #include #include #include -#include -#include #define THE_SIG SIGUSR1 diff --git a/test/nptl/tst-tls3mod.c b/test/nptl/tst-tls3mod.c index 0fd3261..c2cefdf 100644 --- a/test/nptl/tst-tls3mod.c +++ b/test/nptl/tst-tls3mod.c @@ -23,8 +23,6 @@ #include #include #include -#include -#include #if HAVE___THREAD diff --git a/test/nptl/tst-tls4.c b/test/nptl/tst-tls4.c index 378b13a..c8099ad 100644 --- a/test/nptl/tst-tls4.c +++ b/test/nptl/tst-tls4.c @@ -22,7 +22,6 @@ #include #include #include -#include #if HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE diff --git a/test/nptl/tst-tls4moda.c b/test/nptl/tst-tls4moda.c index 9a59cf7..ec8e868 100644 --- a/test/nptl/tst-tls4moda.c +++ b/test/nptl/tst-tls4moda.c @@ -19,7 +19,6 @@ #include #include #include -#include #if HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE diff --git a/test/nptl/tst-tls4modb.c b/test/nptl/tst-tls4modb.c index 66044b2..26056bc 100644 --- a/test/nptl/tst-tls4modb.c +++ b/test/nptl/tst-tls4modb.c @@ -19,7 +19,6 @@ #include #include #include -#include #if HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE diff --git a/test/nptl/tst-tls5.h b/test/nptl/tst-tls5.h index b7c14eb..83cc2fe 100644 --- a/test/nptl/tst-tls5.h +++ b/test/nptl/tst-tls5.h @@ -1,6 +1,5 @@ #include #include -#include #if USE_TLS && HAVE___THREAD diff --git a/test/nptl/tst-typesizes.c b/test/nptl/tst-typesizes.c index 59e9485..77506fd 100644 --- a/test/nptl/tst-typesizes.c +++ b/test/nptl/tst-typesizes.c @@ -17,7 +17,7 @@ . */ #include -#include +#include #include static const struct diff --git a/test/pthread/Makefile.in b/test/pthread/Makefile.in index bd6b29b..9fbecc2 100644 --- a/test/pthread/Makefile.in +++ b/test/pthread/Makefile.in @@ -1,4 +1,4 @@ -# uClibc pthread tests +# uClibc-ng pthread tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. TESTS_DISABLED += cancellation-points diff --git a/test/pwd_grp/Makefile.in b/test/pwd_grp/Makefile.in index d561f3d..b7ec656 100644 --- a/test/pwd_grp/Makefile.in +++ b/test/pwd_grp/Makefile.in @@ -1,4 +1,4 @@ -# uClibc pwd_grp tests +# uClibc-ng pwd_grp tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. DODIFF_test_pwd := 1 diff --git a/test/rpc/Makefile.in b/test/rpc/Makefile.in index 5612ff2..d8ad5e6 100644 --- a/test/rpc/Makefile.in +++ b/test/rpc/Makefile.in @@ -1,4 +1,4 @@ -# uClibc rpc tests +# uClibc-ng rpc tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. TESTS := getrpcent diff --git a/test/rpc/getrpcent.c b/test/rpc/getrpcent.c index e12e768..0283450 100644 --- a/test/rpc/getrpcent.c +++ b/test/rpc/getrpcent.c @@ -3,6 +3,7 @@ int main(int argc, char *argv[]) { +#if defined(__UCLIBC_HAS_RPC__) struct rpcent *ent; while ((ent = getrpcent()) != NULL) { @@ -13,6 +14,6 @@ int main(int argc, char *argv[]) } endrpcent(); - +#endif return 0; } diff --git a/test/signal/Makefile.in b/test/signal/Makefile.in index c8e2545..4f47c67 100644 --- a/test/signal/Makefile.in +++ b/test/signal/Makefile.in @@ -1,4 +1,4 @@ -# uClibc signal tests +# uClibc-ng signal tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ifeq ($(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),) diff --git a/test/silly/Makefile.in b/test/silly/Makefile.in index 6092c80..95f3c5a 100644 --- a/test/silly/Makefile.in +++ b/test/silly/Makefile.in @@ -1,24 +1,7 @@ -# uClibc silly tests +# uClibc-ng silly tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. RET_hello := 42 RET_tiny := 42 -ifeq ($(TARGET_ARCH),ia64) TESTS_DISABLED += tst-atomic tst-atomic-long -endif - -ifeq ($(TARGET_ARCH),mips) -TESTS_DISABLED += tst-atomic tst-atomic-long -endif - -ifeq ($(TARGET_ARCH),sparc) -TESTS_DISABLED += tst-atomic tst-atomic-long -endif - -atomic_headers := -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) \ - -I$(top_srcdir)libc/sysdeps/linux \ - -I$(top_builddir)include - -CFLAGS_tst-atomic = $(atomic_headers) -CFLAGS_tst-atomic-long = $(atomic_headers) diff --git a/test/silly/tst-atomic.c b/test/silly/tst-atomic.c index fc773b2..3ed5942 100644 --- a/test/silly/tst-atomic.c +++ b/test/silly/tst-atomic.c @@ -18,7 +18,6 @@ . */ #include -#include #ifndef atomic_t # define atomic_t int diff --git a/test/stat/Makefile.in b/test/stat/Makefile.in index 9c06ded..c431641 100644 --- a/test/stat/Makefile.in +++ b/test/stat/Makefile.in @@ -1,4 +1,4 @@ -# uClibc stat tests +# uClibc-ng stat tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ifeq ($(UCLIBC_HAS_LFS),) diff --git a/test/stdio/Makefile.in b/test/stdio/Makefile.in index 14b5f19..234b12a 100644 --- a/test/stdio/Makefile.in +++ b/test/stdio/Makefile.in @@ -1,4 +1,4 @@ -# uClibc stdio tests +# uClibc-ng stdio tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. DODIFF_64bit := 1 diff --git a/test/stdlib/Makefile.in b/test/stdlib/Makefile.in index f39941d..a9e95ff 100644 --- a/test/stdlib/Makefile.in +++ b/test/stdlib/Makefile.in @@ -1,4 +1,4 @@ -# uClibc stdlib tests +# uClibc-ng stdlib tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. DODIFF_qsort := 1 diff --git a/test/string/Makefile.in b/test/string/Makefile.in index 39fb912..d821e9b 100644 --- a/test/string/Makefile.in +++ b/test/string/Makefile.in @@ -1,4 +1,4 @@ -# uClibc string tests +# uClibc-ng string tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. EXTRA_CFLAGS := -fno-builtin diff --git a/test/time/Makefile.in b/test/time/Makefile.in index 4eeb741..1c136df 100644 --- a/test/time/Makefile.in +++ b/test/time/Makefile.in @@ -1,4 +1,4 @@ -# uClibc time tests +# uClibc-ng time tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. TESTS_DISABLED := bug-asctime bug-asctime_r time tst-mktime2 tst-posixtz \ diff --git a/test/tls/Makefile b/test/tls/Makefile index 607fec2..1a9687c 100644 --- a/test/tls/Makefile +++ b/test/tls/Makefile @@ -1,4 +1,4 @@ -# uClibc TLS tests +# uClibc-ng TLS tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ diff --git a/test/tls/Makefile.in b/test/tls/Makefile.in index 9f10378..10a515d 100644 --- a/test/tls/Makefile.in +++ b/test/tls/Makefile.in @@ -1,4 +1,4 @@ -# uClibc TLS tests +# uClibc-ng TLS tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. TESTS := tst-tls1 tst-tls2 tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7 \ @@ -11,34 +11,6 @@ TESTS_DISABLED := tst-tls1-static tst-tls2-static tst-tls9-static # guessing some unimplemented check or feature TESTS_DISABLED += tst-tls16 -#all these tests require shared libraries -ifeq ($(HAVE_SHARED),) -TESTS_DISABLED := $(TESTS) -endif - -# All these tests need tls.h, which is not installed with glibc -GLIBC_TESTS_DISABLED := $(addsuffix _glibc,$(filter-out $(TESTS_DISABLED),$(TESTS))) - - -PTDIR := $(top_builddir)libpthread/nptl -SYSDEPS_DIR := $(top_srcdir)libc/sysdeps - -EXTRA_CFLAGS := -DNOT_IN_libc=1 \ - -std=gnu99 -I. \ - -I$(SYSDEPS_DIR)/linux \ - -I$(SYSDEPS_DIR)/linux/$(TARGET_ARCH) \ - -I$(PTDIR) \ - -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ - -I$(PTDIR)/sysdeps/$(TARGET_ARCH) \ - -I$(PTDIR)/sysdeps/unix/sysv/linux \ - -I$(PTDIR)/sysdeps/pthread \ - -I$(PTDIR)/sysdeps/pthread/bits \ - -I$(PTDIR)/sysdeps/generic \ - -I$(top_builddir)ldso/include \ - -I$(top_builddir)ldso/ldso/$(TARGET_ARCH) \ - -I$(top_builddir)include \ - -include $(top_builddir)include/libc-symbols.h - tlsmod17a-suffixes := 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 tlsmod18a-suffixes := 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 CFLAGS_tst-tlsmod1.so := -fPIC -DSHARED -shared diff --git a/test/tls/tst-tls-at-ctor.c b/test/tls/tst-tls-at-ctor.c index 53aece1..ef3ea70 100644 --- a/test/tls/tst-tls-at-ctor.c +++ b/test/tls/tst-tls-at-ctor.c @@ -1,6 +1,5 @@ #include #include -#include #define TLS_VAR_INIT_VALUE 99 diff --git a/test/tls/tst-tls1.c b/test/tls/tst-tls1.c index f5ac6d2..03db7b2 100644 --- a/test/tls/tst-tls1.c +++ b/test/tls/tst-tls1.c @@ -2,8 +2,6 @@ #undef _LIBC #include -#include - #ifdef USE_TLS # include "tls-macros.h" diff --git a/test/tls/tst-tls10.c b/test/tls/tst-tls10.c index fc06770..2c5e823 100644 --- a/test/tls/tst-tls10.c +++ b/test/tls/tst-tls10.c @@ -14,9 +14,9 @@ int main (void) { struct A *p; +#ifdef USE_TLS__THREAD if (local.a != 1 || local.b != 2 || local.c != 3) abort (); -#ifdef USE_TLS__THREAD if (a1.a != 4 || a1.b != 5 || a1.c != 6) abort (); if (a2.a != 22 || a2.b != 23 || a2.c != 24) diff --git a/test/tls/tst-tls10.h b/test/tls/tst-tls10.h index 1be6adc..d55523d 100644 --- a/test/tls/tst-tls10.h +++ b/test/tls/tst-tls10.h @@ -1,4 +1,3 @@ -#include #include #if defined USE_TLS && defined HAVE___THREAD \ diff --git a/test/tls/tst-tls14.c b/test/tls/tst-tls14.c index 428fd52..8395276 100644 --- a/test/tls/tst-tls14.c +++ b/test/tls/tst-tls14.c @@ -4,8 +4,6 @@ #include #include -#include - #if USE_TLS && HAVE___THREAD #define AL 4096 diff --git a/test/tls/tst-tls2.c b/test/tls/tst-tls2.c index 4174899..9f6c35f 100644 --- a/test/tls/tst-tls2.c +++ b/test/tls/tst-tls2.c @@ -1,8 +1,6 @@ /* glibc test for TLS in ld.so. */ #include -#include - #ifdef USE_TLS # include "tls-macros.h" diff --git a/test/tls/tst-tls3.c b/test/tls/tst-tls3.c index 84be435..6f4eaf0 100644 --- a/test/tls/tst-tls3.c +++ b/test/tls/tst-tls3.c @@ -1,8 +1,6 @@ /* glibc test for TLS in ld.so. */ #include -#include - #ifdef USE_TLS # include "tls-macros.h" diff --git a/test/tls/tst-tls4.c b/test/tls/tst-tls4.c index f92ee53..93b8871 100644 --- a/test/tls/tst-tls4.c +++ b/test/tls/tst-tls4.c @@ -2,8 +2,6 @@ #include #include -#include - #define TEST_FUNCTION do_test () static int diff --git a/test/tls/tst-tls5.c b/test/tls/tst-tls5.c index a571d2c..5168049 100644 --- a/test/tls/tst-tls5.c +++ b/test/tls/tst-tls5.c @@ -2,8 +2,6 @@ #include #include -#include - #define TEST_FUNCTION do_test () static int diff --git a/test/tls/tst-tls6.c b/test/tls/tst-tls6.c index 0ebc507..7cc8f6b 100644 --- a/test/tls/tst-tls6.c +++ b/test/tls/tst-tls6.c @@ -1,14 +1,7 @@ #include #include #include - -#include #include -#ifdef __UCLIBC__ -#include "dl-elf.h" -#include "dl-hash.h" -#endif - #define TEST_FUNCTION do_test () static int diff --git a/test/tls/tst-tls7.c b/test/tls/tst-tls7.c index 2dde9af..b8bb71d 100644 --- a/test/tls/tst-tls7.c +++ b/test/tls/tst-tls7.c @@ -1,14 +1,7 @@ #include #include #include - -#include #include -#ifdef __UCLIBC__ -#include "dl-elf.h" -#include "dl-hash.h" -#endif - #define TEST_FUNCTION do_test () static int diff --git a/test/tls/tst-tls8.c b/test/tls/tst-tls8.c index 140de43..4635304 100644 --- a/test/tls/tst-tls8.c +++ b/test/tls/tst-tls8.c @@ -1,14 +1,7 @@ #include #include #include - -#include #include -#ifdef __UCLIBC__ -#include "dl-elf.h" -#include "dl-hash.h" -#endif - #define TEST_FUNCTION do_test () static int diff --git a/test/tls/tst-tls9.c b/test/tls/tst-tls9.c index e317696..61dea1d 100644 --- a/test/tls/tst-tls9.c +++ b/test/tls/tst-tls9.c @@ -1,9 +1,7 @@ #include #include #include - #include -#include #define TEST_FUNCTION do_test () static int diff --git a/test/tls/tst-tlsmod-at-ctor.c b/test/tls/tst-tlsmod-at-ctor.c index bd04b50..712e605 100644 --- a/test/tls/tst-tlsmod-at-ctor.c +++ b/test/tls/tst-tlsmod-at-ctor.c @@ -1,5 +1,4 @@ #include -#include #define TLS_VAR_INIT_VALUE 99 diff --git a/test/tls/tst-tlsmod1.c b/test/tls/tst-tlsmod1.c index b4954ca..a4c8665 100644 --- a/test/tls/tst-tlsmod1.c +++ b/test/tls/tst-tlsmod1.c @@ -1,7 +1,5 @@ #include -#include - #ifdef USE_TLS #include "tls-macros.h" diff --git a/test/tls/tst-tlsmod13.c b/test/tls/tst-tlsmod13.c index beca89f..779b991 100644 --- a/test/tls/tst-tlsmod13.c +++ b/test/tls/tst-tlsmod13.c @@ -1,5 +1,3 @@ -#include - #if defined USE_TLS && defined HAVE___THREAD \ && defined HAVE_TLS_MODEL_ATTRIBUTE __thread int a[2] __attribute__ ((tls_model ("initial-exec"))); diff --git a/test/tls/tst-tlsmod13a.c b/test/tls/tst-tlsmod13a.c index 14b12b0..f3c9681 100644 --- a/test/tls/tst-tlsmod13a.c +++ b/test/tls/tst-tlsmod13a.c @@ -1,5 +1,3 @@ -#include - #if defined USE_TLS && defined HAVE___THREAD \ && defined HAVE_TLS_MODEL_ATTRIBUTE __thread int b[2] __attribute__ ((tls_model ("initial-exec"))); diff --git a/test/tls/tst-tlsmod14a.c b/test/tls/tst-tlsmod14a.c index 0bb393d..c2c6857 100644 --- a/test/tls/tst-tlsmod14a.c +++ b/test/tls/tst-tlsmod14a.c @@ -1,8 +1,6 @@ #include #include -#include - #if USE_TLS && HAVE___THREAD #define AL 4096 diff --git a/test/tls/tst-tlsmod16a.c b/test/tls/tst-tlsmod16a.c index 847c809..a93e102 100644 --- a/test/tls/tst-tlsmod16a.c +++ b/test/tls/tst-tlsmod16a.c @@ -1,5 +1,3 @@ -#include - #if defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE int __thread tlsvar; #else diff --git a/test/tls/tst-tlsmod16b.c b/test/tls/tst-tlsmod16b.c index 308e6ba..7275195 100644 --- a/test/tls/tst-tlsmod16b.c +++ b/test/tls/tst-tlsmod16b.c @@ -1,5 +1,3 @@ -#include - #if defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE extern __thread int tlsvar __attribute__((tls_model("initial-exec"))); #else diff --git a/test/tls/tst-tlsmod2.c b/test/tls/tst-tlsmod2.c index 4547c97..ed8b206 100644 --- a/test/tls/tst-tlsmod2.c +++ b/test/tls/tst-tlsmod2.c @@ -1,7 +1,5 @@ #include -#include - #ifdef USE_TLS #include "tls-macros.h" diff --git a/test/tls/tst-tlsmod3.c b/test/tls/tst-tlsmod3.c index 12505f6..bd0bec1 100644 --- a/test/tls/tst-tlsmod3.c +++ b/test/tls/tst-tlsmod3.c @@ -1,7 +1,5 @@ #include -#include - #ifdef USE_TLS # include "tls-macros.h" diff --git a/test/tls/tst-tlsmod4.c b/test/tls/tst-tlsmod4.c index 4893cda..76a932c 100644 --- a/test/tls/tst-tlsmod4.c +++ b/test/tls/tst-tlsmod4.c @@ -1,7 +1,5 @@ #include -#include - #ifdef USE_TLS # include "tls-macros.h" diff --git a/test/tls/tst-tlsmod5.c b/test/tls/tst-tlsmod5.c index 2ec69e1..f50cd8b 100644 --- a/test/tls/tst-tlsmod5.c +++ b/test/tls/tst-tlsmod5.c @@ -1,5 +1,3 @@ -#include - #ifdef USE_TLS #include "tls-macros.h" diff --git a/test/tls/tst-tlsmod6.c b/test/tls/tst-tlsmod6.c index 0fda51b..2b92ffd 100644 --- a/test/tls/tst-tlsmod6.c +++ b/test/tls/tst-tlsmod6.c @@ -1,5 +1,3 @@ -#include - #ifdef USE_TLS #include "tls-macros.h" diff --git a/test/unistd/Makefile.in b/test/unistd/Makefile.in index 5b65c13..b383388 100644 --- a/test/unistd/Makefile.in +++ b/test/unistd/Makefile.in @@ -1,4 +1,4 @@ -# uClibc unistd tests +# uClibc-ng unistd tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. TESTS_DISABLED := @@ -34,11 +34,3 @@ endif # for embedded systems 4 GB disk space is not available TESTS_DISABLED += tst-posix_fallocate64 tst-fallocate64 -# getconf.c lives in utils/ -# Testsuite cannot currently be built with O= anyway, so hardcode path here -getconf.c: - $(LN_S) ../../utils/$(@F) . -EXTRA_CLEAN += getconf.c -TESTS_DISABLED += getconf -CFLAGS_getconf = -DGETCONF_DIR='"$(CURDIR)"' -shell_tst-getconf: getconf getconf_glibc diff --git a/test/unistd/tst-getconf.sh b/test/unistd/tst-getconf.sh deleted file mode 100755 index 3a2aa4e..0000000 --- a/test/unistd/tst-getconf.sh +++ /dev/null @@ -1,240 +0,0 @@ -#! /bin/sh - -basedir="." - -# make sure to use the same locale everywhere. -LC_ALL=C -export LC_ALL -LANG=C -export LANG - -for suffix in _glibc '' -do -binary=$basedir/getconf$suffix -logfile=$basedir/tst-getconf$suffix.out -rm -f $logfile - -result=0 -while read name; do - case "$name" in - "#"*) continue;; - esac - echo -n "getconf $name: " >> $logfile - $binary "$name" 2>> $logfile >> $logfile - if test $? -ne 0; then - echo "*** $name FAILED" >> $logfile - result=1 - fi -done <> $logfile - $binary "$name" / 2>> $logfile >> $logfile - if test $? -ne 0; then - echo "*** $name FAILED" >> $logfile - result=1 - fi -done <