diff mbox

Removing ChangeLog [Was Re: 2.26 hard freeze status]

Message ID CAMe9rOoG3Muq8q57iBU6PEfxsLaX61Vur_e=J8yQ9e_f=EO6PQ@mail.gmail.com
State New, archived
Headers show

Commit Message

H.J. Lu Sept. 1, 2017, 5:22 p.m. UTC
On Fri, Sep 1, 2017 at 9:22 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Fri, Sep 1, 2017 at 6:35 AM, Zack Weinberg <zackw@panix.com> wrote:
>> On 08/03/2017 12:22 AM, Siddhesh Poyarekar wrote:
>>> On Wednesday 02 August 2017 11:36 PM, Joseph Myers wrote:
>>>> If we do that, it should have all the old ChangeLogs, including
>>>> ChangeLog.old-ports* and nptl/ChangeLog.old and nptl_db/ChangeLog.old
>>>> (appropriately named).  (I also think that unless and until we can stop
>>>> using ChangeLogs, we should also move to using just the toplevel ChangeLog
>>>> for all changes, including libidn and localedata, which would mean moving
>>>> their existing files as well, but that's a separate issue.)
>>>
>>> It makes sense to me, I'll make that directory and move all ChangeLog
>>> files except the toplevel ChangeLog into it if nobody objects by the end
>>> of the week.
>>
>> There were no objections, but Siddhesh never got around to it either, so
>> I have done this now.  Here is the complete set of renames:
>>
>> old name                          new name
>> --------                          --------
>> ChangeLog.1                       ChangeLog.old/ChangeLog.1
>> ChangeLog.10                      ChangeLog.old/ChangeLog.10
>> ChangeLog.11                      ChangeLog.old/ChangeLog.11
>> ChangeLog.12                      ChangeLog.old/ChangeLog.12
>> ChangeLog.13                      ChangeLog.old/ChangeLog.13
>> ChangeLog.14                      ChangeLog.old/ChangeLog.14
>> ChangeLog.15                      ChangeLog.old/ChangeLog.15
>> ChangeLog.16                      ChangeLog.old/ChangeLog.16
>> ChangeLog.17                      ChangeLog.old/ChangeLog.17
>> ChangeLog.18                      ChangeLog.old/ChangeLog.18
>> ChangeLog.2                       ChangeLog.old/ChangeLog.2
>> ChangeLog.3                       ChangeLog.old/ChangeLog.3
>> ChangeLog.4                       ChangeLog.old/ChangeLog.4
>> ChangeLog.5                       ChangeLog.old/ChangeLog.5
>> ChangeLog.6                       ChangeLog.old/ChangeLog.6
>> ChangeLog.7                       ChangeLog.old/ChangeLog.7
>> ChangeLog.8                       ChangeLog.old/ChangeLog.8
>> ChangeLog.9                       ChangeLog.old/ChangeLog.9
>> ChangeLog.old-ports               ChangeLog.old/ChangeLog.ports
>> ChangeLog.old-ports-aarch64       ChangeLog.old/ChangeLog.ports-aarch64
>> ChangeLog.old-ports-aix           ChangeLog.old/ChangeLog.ports-aix
>> ChangeLog.old-ports-alpha         ChangeLog.old/ChangeLog.ports-alpha
>> ChangeLog.old-ports-am33          ChangeLog.old/ChangeLog.ports-am33
>> ChangeLog.old-ports-arm           ChangeLog.old/ChangeLog.ports-arm
>> ChangeLog.old-ports-cris          ChangeLog.old/ChangeLog.ports-cris
>> ChangeLog.old-ports-hppa          ChangeLog.old/ChangeLog.ports-hppa
>> ChangeLog.old-ports-ia64          ChangeLog.old/ChangeLog.ports-ia64
>> ChangeLog.old-ports-linux-generic
>> ChangeLog.old/ChangeLog.ports-linux-generic
>> ChangeLog.old-ports-m68k          ChangeLog.old/ChangeLog.ports-m68k
>> ChangeLog.old-ports-microblaze    ChangeLog.old/ChangeLog.ports-microblaze
>> ChangeLog.old-ports-mips          ChangeLog.old/ChangeLog.ports-mips
>> ChangeLog.old-ports-powerpc       ChangeLog.old/ChangeLog.ports-powerpc
>> ChangeLog.old-ports-tile          ChangeLog.old/ChangeLog.ports-tile
>> nptl/ChangeLog.old                ChangeLog.old/ChangeLog.nptl
>> nptl_db/ChangeLog.old             ChangeLog.old/ChangeLog.nptl_db
>> libidn/ChangeLog                  ChangeLog.old/ChangeLog.libidn
>> localedata/ChangeLog              ChangeLog.old/ChangeLog.localedata
>>
>> As suggested by Joseph, this includes libidn/ChangeLog and
>> localedata/ChangeLog; further changes to those directories should be
>> logged at top level.
>>
>
> 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.

Comments

Zack Weinberg Sept. 1, 2017, 5:37 p.m. UTC | #1
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
Siddhesh Poyarekar Sept. 4, 2017, 5:40 a.m. UTC | #2
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
diff mbox

Patch

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