diff mbox series

[committed] Remove bogus initial lines from test.

Message ID 20200114233902.GL10088@tucnak
State New
Headers show
Series [committed] Remove bogus initial lines from test. | expand

Commit Message

Jakub Jelinek Jan. 14, 2020, 11:39 p.m. UTC
Hi!

I've noticed
FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O0 -flto -flto-partition=none -fuse-linker-plugin
FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O2 -flto -flto-partition=none -fuse-linker-plugin -fno-fat-lto-objects 
FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O0 -flto -flto-partition=1to1 -fno-use-linker-plugin 
FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O2 -flto -flto-partition=1to1 -fno-use-linker-plugin 
FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O0 -flto -fuse-linker-plugin -fno-fat-lto-objects 
FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O2 -flto -fuse-linker-plugin
on both x86_64-linux and i686-linux, dunno how those lines made it into the
test.  Anyway, fixed thusly, tested on x86_64-linux, test passes now,
committed to trunk as obvious.


	Jakub

Comments

Jan Hubicka Jan. 15, 2020, 8:27 a.m. UTC | #1
> Hi!
> 
> I've noticed
> FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O0 -flto -flto-partition=none -fuse-linker-plugin
> FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O2 -flto -flto-partition=none -fuse-linker-plugin -fno-fat-lto-objects 
> FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O0 -flto -flto-partition=1to1 -fno-use-linker-plugin 
> FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O2 -flto -flto-partition=1to1 -fno-use-linker-plugin 
> FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O0 -flto -fuse-linker-plugin -fno-fat-lto-objects 
> FAIL: g++.dg/lto/odr-8 cp_lto_odr-8_1.o assemble, -O2 -flto -fuse-linker-plugin
> on both x86_64-linux and i686-linux, dunno how those lines made it into the
> test.  Anyway, fixed thusly, tested on x86_64-linux, test passes now,
> committed to trunk as obvious.
Ah, sorry.
I had bit of problem git oversmarting me on this commint.  I was in my
branch and then switched to master, but instead that I created another
branch of same name as master where I made and comitted the original
patch. Then noticed that push does nothing so worked out that I am in
bogus branch. After that I removed the branch and used diff I produced
earlier to bring it over to trunk, but for some reason in that diff the
testcase was relative to time I added the file and not new file.
I had to do that twice since first time I ended in detached head and I
gess second time I failed to check that testcase is OK.

Eventually I hope to get smarter than git :)
Honza
> 
> diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
> index ea37d69fa88..8e99328feb2 100644
> --- a/gcc/testsuite/ChangeLog
> +++ b/gcc/testsuite/ChangeLog
> @@ -1,13 +1,16 @@
>  2020-01-15  Jakub Jelinek  <jakub@redhat.com>
>  
> +	PR lto/91576
> +	* g++.dg/lto/odr-8_1.C: Remove bogus initial lines.
> +
>  	PR target/93009
>  	* gcc.target/i386/avx512vl-pr93009.c: New test.
>  
>  2020-01-14  Jan Hubicka  <hubicka@ucw.cz>
>  
>  	PR lto/91576
> -	* testsuite/g++.dg/lto/odr-8_0.C: New testcase.
> -	* testsuite/g++.dg/lto/odr-8_1.C: New testcase.
> +	* g++.dg/lto/odr-8_0.C: New testcase.
> +	* g++.dg/lto/odr-8_1.C: New testcase.
>  
>  2020-01-14  David Malcolm  <dmalcolm@redhat.com>
>  
> diff --git a/gcc/testsuite/g++.dg/lto/odr-8_1.C b/gcc/testsuite/g++.dg/lto/odr-8_1.C
> index 742df8cc906..cbcd15d76ad 100644
> --- a/gcc/testsuite/g++.dg/lto/odr-8_1.C
> +++ b/gcc/testsuite/g++.dg/lto/odr-8_1.C
> @@ -1,6 +1,3 @@
> ---- a/gcc/testsuite/g++.dg/lto/odr-8_1.C
> -+++ b/gcc/testsuite/g++.dg/lto/odr-8_1.C
> -@@ -1,9 +1,9 @@
>  struct a {char c; a() {} a(struct a &) {}}; // { dg-lto-message "one type needs to be constructed while other not" }
>  extern int test (struct a *a);
>  int
> 
> 	Jakub
>
diff mbox series

Patch

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ea37d69fa88..8e99328feb2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,13 +1,16 @@ 
 2020-01-15  Jakub Jelinek  <jakub@redhat.com>
 
+	PR lto/91576
+	* g++.dg/lto/odr-8_1.C: Remove bogus initial lines.
+
 	PR target/93009
 	* gcc.target/i386/avx512vl-pr93009.c: New test.
 
 2020-01-14  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR lto/91576
-	* testsuite/g++.dg/lto/odr-8_0.C: New testcase.
-	* testsuite/g++.dg/lto/odr-8_1.C: New testcase.
+	* g++.dg/lto/odr-8_0.C: New testcase.
+	* g++.dg/lto/odr-8_1.C: New testcase.
 
 2020-01-14  David Malcolm  <dmalcolm@redhat.com>
 
diff --git a/gcc/testsuite/g++.dg/lto/odr-8_1.C b/gcc/testsuite/g++.dg/lto/odr-8_1.C
index 742df8cc906..cbcd15d76ad 100644
--- a/gcc/testsuite/g++.dg/lto/odr-8_1.C
+++ b/gcc/testsuite/g++.dg/lto/odr-8_1.C
@@ -1,6 +1,3 @@ 
---- a/gcc/testsuite/g++.dg/lto/odr-8_1.C
-+++ b/gcc/testsuite/g++.dg/lto/odr-8_1.C
-@@ -1,9 +1,9 @@
 struct a {char c; a() {} a(struct a &) {}}; // { dg-lto-message "one type needs to be constructed while other not" }
 extern int test (struct a *a);
 int