diff options
| author | Florian Weimer <fweimer@redhat.com> | 2015-04-24 17:34:47 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2015-04-24 17:34:48 +0200 |
| commit | 42261ad731991df345880b0b509d83b0b9a9b9d8 (patch) | |
| tree | 440bf43dca45a9002402ec602f0deaf3bfa6e3e3 /timezone/Makefile | |
| parent | ed159672eb3cd650a32b7e5cb4d5ec1fe0e63802 (diff) | |
| download | glibc-42261ad731991df345880b0b509d83b0b9a9b9d8.tar.gz glibc-42261ad731991df345880b0b509d83b0b9a9b9d8.tar.xz glibc-42261ad731991df345880b0b509d83b0b9a9b9d8.zip | |
Make time zone file parser more robust [BZ #17715]
Diffstat (limited to 'timezone/Makefile')
| -rw-r--r-- | timezone/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/timezone/Makefile b/timezone/Makefile index 17424b8103..5f185458bc 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -25,7 +25,7 @@ include ../Makeconfig extra-objs := scheck.o ialloc.o others := zdump zic -tests := test-tz tst-timezone +tests := test-tz tst-timezone tst-tzset # pacificnew doesn't compile; if it is to be used, it should be included in # northamerica. @@ -90,9 +90,11 @@ $(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \ Australia/Melbourne \ America/Sao_Paulo Asia/Tokyo \ Europe/London) +$(objpfx)tst-tzset.out: $(addprefix $(testdata)/XT, 1 2 3 4) test-tz-ENV = TZDIR=$(testdata) tst-timezone-ENV = TZDIR=$(testdata) +tst-tzset-ENV = TZDIR=$(testdata) # Note this must come second in the deps list for $(built-program-cmd) to work. zic-deps = $(objpfx)zic $(leapseconds) yearistype @@ -114,6 +116,8 @@ $(testdata)/America/Sao_Paulo: southamerica $(zic-deps) $(testdata)/Asia/Tokyo: asia $(zic-deps) $(build-testdata) +$(testdata)/XT%: testdata/XT% + cp $< $@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make sed -e 's|/bin/bash|$(BASH)|' \ |