c06a6956a4
Update. 2004-11-18 Jakub Jelinek <jakub@redhat.com> [BZ #544] * posix/regex.h (RE_NO_SUB): New define. * posix/regex_internal.h (OP_DELETED_SUBEXP): New. (re_dfa_t): Add subexp_map. * posix/regcomp.c (struct subexp_optimize): New type. (optimize_subexps): New routine. (re_compile_internal): Call it. (re_compile_pattern): Set preg->no_sub to 1 if RE_NO_SUB. (free_dfa_content): Free subexp_map. (calc_inveclosure, calc_eclosure): Skip OP_DELETED_SUBEXP nodes. * posix/regexec.c (re_search_internal): If subexp_map is not NULL, duplicate registers as needed. * posix/Makefile: Add rules to build and run tst-regex2. * posix/tst-regex2.c: New test. * posix/rxspencer/tests: Fix last two tests (\0 -> \1). Add some new tests for nested subexpressions.
263 lines
10 KiB
Makefile
263 lines
10 KiB
Makefile
# Copyright (C) 1991-1999, 2000-2003, 2004 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
# 02111-1307 USA.
|
|
|
|
#
|
|
# Sub-makefile for POSIX portion of the library.
|
|
#
|
|
subdir := posix
|
|
|
|
headers := sys/utsname.h sys/times.h sys/wait.h sys/types.h unistd.h \
|
|
glob.h regex.h wordexp.h fnmatch.h getopt.h \
|
|
bits/types.h bits/typesizes.h bits/pthreadtypes.h \
|
|
bits/posix1_lim.h bits/posix2_lim.h bits/posix_opt.h \
|
|
bits/local_lim.h tar.h bits/utsname.h bits/confname.h \
|
|
bits/waitflags.h bits/waitstatus.h sys/unistd.h sched.h \
|
|
bits/sched.h re_comp.h wait.h bits/environments.h cpio.h \
|
|
sys/sysmacros.h spawn.h
|
|
|
|
distribute := confstr.h TESTS TESTS2C.sed testcases.h \
|
|
PTESTS PTESTS2C.sed ptestcases.h \
|
|
globtest.c globtest.sh wordexp-tst.sh annexc.c fnmatch_loop.c \
|
|
spawn_int.h tst-getconf.sh regcomp.c regexec.c regex_internal.c \
|
|
regex_internal.h fork.h rxspencer/tests rxspencer/COPYRIGHT \
|
|
PCRE.tests BOOST.tests
|
|
|
|
routines := \
|
|
uname \
|
|
times \
|
|
wait waitpid wait3 wait4 waitid \
|
|
alarm sleep pause nanosleep \
|
|
fork vfork _exit \
|
|
execve fexecve execv execle execl execvp execlp \
|
|
getpid getppid \
|
|
getuid geteuid getgid getegid getgroups setuid setgid group_member \
|
|
getpgid setpgid getpgrp bsd-getpgrp setpgrp getsid setsid \
|
|
getresuid getresgid setresuid setresgid \
|
|
getlogin getlogin_r setlogin \
|
|
pathconf sysconf fpathconf \
|
|
glob glob64 fnmatch regex \
|
|
confstr \
|
|
getopt getopt1 getopt_init \
|
|
sched_setp sched_getp sched_sets sched_gets sched_yield sched_primax \
|
|
sched_primin sched_rr_gi sched_getaffinity sched_setaffinity \
|
|
getaddrinfo gai_strerror wordexp \
|
|
pread pwrite pread64 pwrite64 \
|
|
spawn_faction_init spawn_faction_destroy spawn_faction_addclose \
|
|
spawn_faction_addopen spawn_faction_adddup2 \
|
|
spawnattr_init spawnattr_destroy \
|
|
spawnattr_getdefault spawnattr_setdefault \
|
|
spawnattr_getflags spawnattr_setflags \
|
|
spawnattr_getpgroup spawnattr_setpgroup spawn spawnp spawni \
|
|
spawnattr_getsigmask spawnattr_getschedpolicy spawnattr_getschedparam \
|
|
spawnattr_setsigmask spawnattr_setschedpolicy spawnattr_setschedparam \
|
|
posix_madvise
|
|
|
|
include ../Makeconfig
|
|
|
|
aux := init-posix environ
|
|
tests := tstgetopt testfnm runtests runptests \
|
|
tst-preadwrite tst-preadwrite64 test-vfork regexbug1 \
|
|
tst-getlogin tst-mmap tst-getaddrinfo tst-truncate \
|
|
tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \
|
|
tst-chmod bug-regex1 bug-regex2 bug-regex3 bug-regex4 \
|
|
tst-gnuglob tst-regex bug-regex5 bug-regex6 bug-regex7 \
|
|
bug-regex8 bug-regex9 bug-regex10 bug-regex11 bug-regex12 \
|
|
bug-regex13 bug-regex14 bug-regex15 bug-regex16 \
|
|
bug-regex17 bug-regex18 bug-regex19 bug-regex20 \
|
|
bug-regex21 bug-regex22 bug-regex23 bug-regex24 \
|
|
tst-nice tst-nanosleep tst-regex2 \
|
|
transbug tst-rxspencer tst-pcre tst-boost \
|
|
bug-ga1 tst-vfork1 tst-vfork2 tst-waitid \
|
|
tst-getaddrinfo2 bug-glob1 bug-glob2
|
|
xtests := bug-ga2
|
|
ifeq (yes,$(build-shared))
|
|
test-srcs := globtest
|
|
tests += wordexp-test tst-exec tst-spawn
|
|
endif
|
|
others := getconf
|
|
install-bin := getconf
|
|
|
|
before-compile := testcases.h ptestcases.h
|
|
|
|
# So they get cleaned up.
|
|
generated := $(addprefix wordexp-test-result, 1 2 3 4 5 6 7 8 9 10) \
|
|
annexc annexc.out wordexp-tst.out bug-regex2-mem \
|
|
bug-regex2.mtrace bug-regex14-mem bug-regex14.mtrace \
|
|
bug-regex21-mem bug-regex21.mtrace \
|
|
tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
|
|
tst-pcre-mem tst-pcre.mtrace tst-boost-mem tst-boost.mtrace \
|
|
bug-ga2.mtrace bug-ga2-mem bug-glob2.mtrace bug-glob2-mem
|
|
|
|
include ../Rules
|
|
|
|
ifeq (yes,$(build-static-nss))
|
|
# We need it for "make check" only. We can skip them if they haven't
|
|
# been built yet during "make".
|
|
otherlibs += $(wildcard $(nssobjdir)/libnss_files.a \
|
|
$(resolvobjdir)/libnss_dns.a \
|
|
$(resolvobjdir)/libresolv.a)
|
|
endif
|
|
|
|
ifeq (no,$(cross-compiling))
|
|
# globtest and wordexp-test currently only works with shared libraries
|
|
ifeq (yes,$(build-shared))
|
|
tests: $(objpfx)globtest.out $(objpfx)wordexp-tst.out
|
|
$(objpfx)globtest.out: globtest.sh $(objpfx)globtest
|
|
$(SHELL) -e globtest.sh $(common-objpfx) $(elf-objpfx) \
|
|
$(rtld-installed-name)
|
|
$(objpfx)wordexp-tst.out: wordexp-tst.sh $(objpfx)wordexp-test
|
|
$(SHELL) -e wordexp-tst.sh $(common-objpfx) $(elf-objpfx) \
|
|
$(rtld-installed-name)
|
|
endif
|
|
endif
|
|
|
|
CFLAGS-regex.c = -Wno-strict-prototypes
|
|
CFLAGS-getaddrinfo.c = -DRESOLVER -fexceptions -DUSE_NSCD
|
|
CFLAGS-pread.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-pread64.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-pwrite.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-pwrite64.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-sleep.c = -fexceptions
|
|
CFLAGS-wait.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-waitid.c = -fexceptions
|
|
CFLAGS-waitpid.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-getopt.c = -fexceptions
|
|
CFLAGS-wordexp.c = -fexceptions
|
|
CFLAGS-sysconf.c = -fexceptions
|
|
CFLAGS-pathconf.c = -fexceptions
|
|
CFLAGS-fpathconf.c = -fexceptions
|
|
CFLAGS-spawn.c = -fexceptions
|
|
CFLAGS-spawnp.c = -fexceptions
|
|
CFLAGS-spawni.c = -fexceptions
|
|
CFLAGS-pause.c = -fexceptions
|
|
CFLAGS-glob.c = $(uses-callbacks) -fexceptions
|
|
CFLAGS-glob64.c = $(uses-callbacks) -fexceptions
|
|
|
|
tstgetopt-ARGS = -a -b -cfoobar --required foobar --optional=bazbug \
|
|
--none random --col --color --colour
|
|
|
|
tst-exec-ARGS = -- $(built-program-cmd)
|
|
tst-spawn-ARGS = -- $(built-program-cmd)
|
|
tst-dir-ARGS = `pwd` `cd $(common-objdir)/$(subdir); pwd` `cd $(common-objdir); pwd` $(objpfx)tst-dir
|
|
tst-chmod-ARGS = `pwd`
|
|
|
|
tst-fnmatch-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-regexloc-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug-regex1-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-regex-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-regex2-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug-regex5-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug-regex6-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug-regex17-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug-regex18-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug-regex19-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug-regex20-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug-regex22-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug-regex23-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-rxspencer-ARGS = --utf8 rxspencer/tests
|
|
tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-pcre-ARGS = PCRE.tests
|
|
tst-boost-ARGS = BOOST.tests
|
|
bug-glob1-ARGS = "$(objpfx)"
|
|
|
|
testcases.h: TESTS TESTS2C.sed
|
|
sed -f TESTS2C.sed < $< > $@T
|
|
mv -f $@T $@
|
|
ifeq ($(with-cvs),yes)
|
|
test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@
|
|
endif
|
|
|
|
ptestcases.h: PTESTS PTESTS2C.sed
|
|
sed -f PTESTS2C.sed < $< > $@T
|
|
mv -f $@T $@
|
|
ifeq ($(with-cvs),yes)
|
|
test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@
|
|
endif
|
|
|
|
# Run a test on the header files we use.
|
|
# XXX Please note that for now we ignore the result of this test.
|
|
tests: $(objpfx)annexc.out
|
|
ifeq (no,$(cross-compiling))
|
|
tests: $(objpfx)bug-regex2-mem $(objpfx)bug-regex14-mem \
|
|
$(objpfx)bug-regex21-mem $(objpfx)tst-rxspencer-mem \
|
|
$(objpfx)tst-pcre-mem $(objpfx)tst-boost-mem $(objpfx)tst-getconf.out \
|
|
$(objpfx)bug-glob2-mem
|
|
xtests: $(objpfx)bug-ga2-mem
|
|
endif
|
|
|
|
$(objpfx)annexc.out: $(objpfx)annexc
|
|
-$(dir $<)$(notdir $<) '$(CC)' \
|
|
'$(patsubst %,-I../%,$(sorted-subdirs)) -I../include -I.. $(+sysdep-includes) $(sysincludes)' > $@
|
|
|
|
annexc-CFLAGS = -O
|
|
$(objpfx)annexc: annexc.c
|
|
$(native-compile)
|
|
|
|
bug-regex2-ENV = MALLOC_TRACE=$(objpfx)bug-regex2.mtrace
|
|
|
|
$(objpfx)bug-regex2-mem: $(objpfx)bug-regex2.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)bug-regex2.mtrace > $@
|
|
|
|
bug-regex14-ENV = MALLOC_TRACE=$(objpfx)bug-regex14.mtrace
|
|
|
|
$(objpfx)bug-regex14-mem: $(objpfx)bug-regex14.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)bug-regex14.mtrace > $@
|
|
|
|
bug-regex21-ENV = MALLOC_TRACE=$(objpfx)bug-regex21.mtrace
|
|
|
|
$(objpfx)bug-regex21-mem: $(objpfx)bug-regex21.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)bug-regex21.mtrace > $@
|
|
|
|
# tst-rxspencer.mtrace is generated only when run without --utf8
|
|
# option, since otherwise the file has almost 100M and takes very long
|
|
# time to process.
|
|
$(objpfx)tst-rxspencer-mem: $(objpfx)tst-rxspencer.out
|
|
MALLOC_TRACE=$(objpfx)tst-rxspencer.mtrace $(tst-rxspencer-ENV) \
|
|
$(run-program-prefix) $(objpfx)tst-rxspencer rxspencer/tests \
|
|
> /dev/null
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-rxspencer.mtrace > $@
|
|
|
|
tst-pcre-ENV = MALLOC_TRACE=$(objpfx)tst-pcre.mtrace
|
|
$(objpfx)tst-pcre-mem: $(objpfx)tst-pcre.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-pcre.mtrace > $@
|
|
|
|
tst-boost-ENV = MALLOC_TRACE=$(objpfx)tst-boost.mtrace
|
|
$(objpfx)tst-boost-mem: $(objpfx)tst-boost.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-boost.mtrace > $@
|
|
|
|
$(objpfx)tst-getconf.out: tst-getconf.sh $(objpfx)getconf
|
|
$(SHELL) -e $< $(common-objpfx) $(elf-objpfx) $(rtld-installed-name)
|
|
|
|
ifeq (yes,$(build-shared))
|
|
$(objpfx)tst-regex: $(common-objpfx)rt/librt.so
|
|
$(objpfx)tst-regex2: $(common-objpfx)rt/librt.so
|
|
else
|
|
$(objpfx)tst-regex: $(common-objpfx)rt/librt.a
|
|
$(objpfx)tst-regex2: $(common-objpfx)rt/librt.a
|
|
endif
|
|
|
|
$(objpfx)bug-ga2-mem: $(objpfx)bug-ga2.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)bug-ga2.mtrace > $@
|
|
|
|
bug-ga2-ENV = MALLOC_TRACE=$(objpfx)bug-ga2.mtrace
|
|
|
|
bug-glob2-ENV = MALLOC_TRACE=$(objpfx)bug-glob2.mtrace
|
|
|
|
$(objpfx)bug-glob2-mem: $(objpfx)bug-glob2.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)bug-glob2.mtrace > $@
|