Message ID | CAMe9rOoG3Muq8q57iBU6PEfxsLaX61Vur_e=J8yQ9e_f=EO6PQ@mail.gmail.com |
---|---|
State | New, archived |
Headers | show |
On Fri, Sep 1, 2017 at 1:22 PM, H.J. Lu <hjl.tools@gmail.com> wrote: > On Fri, Sep 1, 2017 at 9:22 AM, H.J. Lu <hjl.tools@gmail.com> wrote: >> >> These caused: >> >> FAIL: posix/tst-regex >> FAIL: posix/tst-regex2 >> > > I checked in this patch to update tst-regex.c/tst-regex2.c for old ChangeLog > move. Thank you. zw
On Friday 01 September 2017 10:52 PM, H.J. Lu wrote: > I checked in this patch to update tst-regex.c/tst-regex2.c for old ChangeLog > move. > > <snip> > /* Make the content of the file available in memory. */ > - file = "../ChangeLog.8"; > + file = "../ChangeLog.old/ChangeLog.8"; > fd = open (file, O_RDONLY); > if (fd == -1) > error (EXIT_FAILURE, errno, "cannot open %s", basename (file)); > diff --git a/posix/tst-regex2.c b/posix/tst-regex2.c > index 0d82c2acdd..5e624cb5c2 100644 > --- a/posix/tst-regex2.c > +++ b/posix/tst-regex2.c > @@ -33,7 +33,7 @@ do_test (void) > "((((((((((.?))))))))))((((((((((.?))))))))))((((((((((.?))))))))))" > "((((((((((.?))))))))))Log\\.13" }; > > - int fd = open ("../ChangeLog.14", O_RDONLY); > + int fd = open ("../ChangeLog.old/ChangeLog.14", O_RDONLY); > if (fd < 0) > { > printf ("Couldn't open ChangeLog.14: %m\n"); > Instead, it might be cleaner to just copy those files to tst-regex2-input.txt or similar. We will likely run into this issue again in another 5 years when all of us have forgotten about this ghost dependency. Siddhesh
From b30082799dfcd55ccbffce1dd74179d02ee1f41c Mon Sep 17 00:00:00 2001 From: "H.J. Lu" <hjl.tools@gmail.com> Date: Fri, 1 Sep 2017 10:20:49 -0700 Subject: [PATCH] Update tst-regex.c/tst-regex2.c for old ChangeLog move * posix/tst-regex.c (do_test): Replace "../ChangeLog.8" with "../ChangeLog.old/ChangeLog.8". * posix/tst-regex2.c (do_test): Replace "../ChangeLog.14" with "../ChangeLog.old/ChangeLog.14". --- ChangeLog | 7 +++++++ posix/tst-regex.c | 2 +- posix/tst-regex2.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a142d38508..b06aeda7c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2017-09-01 H.J. Lu <hongjiu.lu@intel.com> + * posix/tst-regex.c (do_test): Replace "../ChangeLog.8" with + "../ChangeLog.old/ChangeLog.8". + * posix/tst-regex2.c (do_test): Replace "../ChangeLog.14" with + "../ChangeLog.old/ChangeLog.14". + +2017-09-01 H.J. Lu <hongjiu.lu@intel.com> + * manual/contrib.texi: Credit Ulrich Drepper for the POSIX Threads Library. diff --git a/posix/tst-regex.c b/posix/tst-regex.c index df2c108be5..90a8ccb088 100644 --- a/posix/tst-regex.c +++ b/posix/tst-regex.c @@ -67,7 +67,7 @@ do_test (void) mtrace (); /* Make the content of the file available in memory. */ - file = "../ChangeLog.8"; + file = "../ChangeLog.old/ChangeLog.8"; fd = open (file, O_RDONLY); if (fd == -1) error (EXIT_FAILURE, errno, "cannot open %s", basename (file)); diff --git a/posix/tst-regex2.c b/posix/tst-regex2.c index 0d82c2acdd..5e624cb5c2 100644 --- a/posix/tst-regex2.c +++ b/posix/tst-regex2.c @@ -33,7 +33,7 @@ do_test (void) "((((((((((.?))))))))))((((((((((.?))))))))))((((((((((.?))))))))))" "((((((((((.?))))))))))Log\\.13" }; - int fd = open ("../ChangeLog.14", O_RDONLY); + int fd = open ("../ChangeLog.old/ChangeLog.14", O_RDONLY); if (fd < 0) { printf ("Couldn't open ChangeLog.14: %m\n"); -- 2.13.5