jit.exp: Don't drop the extension from the testcase when naming executable

gcc/jit/ChangeLog:
	* docs/internals/index.rst: Update to reflect that built
	testcases are now test-foo.c.exe, rather than test-foo.exe.
	* docs/_build/texinfo/libgccjit.texi: Regenerate.

gcc/testsuite/ChangeLog:
	* jit.dg/jit.exp (jit-dg-test): Remove "rootname" call when
	generating name of built executable.

From-SVN: r219312

diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index 5685b1f0d2d843b51b6edf13e1ca0020a63ee118..6126d02e80ec4c6f111633ddf2aa29b010b8a131 100644 (file)
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-07  David Malcolm  <dmalcolm@redhat.com>
+
+       * docs/internals/index.rst: Update to reflect that built
+       testcases are now test-foo.c.exe, rather than test-foo.exe.
+       * docs/_build/texinfo/libgccjit.texi: Regenerate.
+
 2015-01-05  Jakub Jelinek  <jakub@redhat.com>
 
        Update copyright years.

diff --git a/gcc/jit/docs/_build/texinfo/libgccjit.texi b/gcc/jit/docs/_build/texinfo/libgccjit.texi
index 72feecd1f3beab85b6996fcab3a055f5ee369d46..64862dc56c92547fcf596d054cce28aac07baf4d 100644 (file)
--- a/gcc/jit/docs/_build/texinfo/libgccjit.texi
+++ b/gcc/jit/docs/_build/texinfo/libgccjit.texi
@@ -19,7 +19,7 @@
 
 @copying
 @quotation
-libgccjit 5.0.0 (experimental 20141211), December 11, 2014
+libgccjit 5.0.0 (experimental 20150107), January 07, 2015
 
 David Malcolm
 
@@ -1185,7 +1185,7 @@ Here's what the final control flow graph will look like:
 
 @float Figure
 
-@image{sum-of-squares,,,image of a control flow graph,png}
+@image{sum-of-squares1,,,image of a control flow graph,png}
 
 @end float
 
@@ -1570,7 +1570,7 @@ install it with @cite{yum install python-xdot}):
 
 @float Figure
 
-@image{sum-of-squares,,,image of a control flow graph,png}
+@image{sum-of-squares1,,,image of a control flow graph,png}
 
 @end float
 
@@ -2834,7 +2834,7 @@ errors in our compiler.
 
 @float Figure
 
-@image{factorial,,,image of a control flow graph,png}
+@image{factorial1,,,image of a control flow graph,png}
 
 @end float
 
@@ -7436,7 +7436,7 @@ Here's what the final control flow graph will look like:
 
 @float Figure
 
-@image{sum-of-squares1,,,image of a control flow graph,png}
+@image{sum-of-squares,,,image of a control flow graph,png}
 
 @end float
 
@@ -7852,7 +7852,7 @@ install it with @cite{yum install python-xdot}):
 
 @float Figure
 
-@image{sum-of-squares1,,,image of a control flow graph,png}
+@image{sum-of-squares,,,image of a control flow graph,png}
 
 @end float
 
@@ -9021,7 +9021,7 @@ errors in our compiler.
 
 @float Figure
 
-@image{factorial1,,,image of a control flow graph,png}
+@image{factorial,,,image of a control flow graph,png}
 
 @end float
 
@@ -12050,7 +12050,7 @@ and once a test has been compiled, you can debug it directly:
         LD_LIBRARY_PATH=. \
         LIBRARY_PATH=. \
           gdb --args \
-            testsuite/jit/test-factorial.exe
+            testsuite/jit/test-factorial.c.exe
 @end example
 
 @noindent
@@ -12094,11 +12094,11 @@ $ RUN_UNDER_VALGRIND= \
 
 $ less testsuite/jit/jit.sum
 (...other results...)
-XFAIL: jit.dg/test-sum-of-squares.c: test-sum-of-squares.exe.valgrind.txt: definitely lost: 8 bytes in 1 blocks
-XFAIL: jit.dg/test-sum-of-squares.c: test-sum-of-squares.exe.valgrind.txt: unsuppressed errors: 1
+XFAIL: jit.dg/test-sum-of-squares.c: test-sum-of-squares.c.exe.valgrind.txt: definitely lost: 8 bytes in 1 blocks
+XFAIL: jit.dg/test-sum-of-squares.c: test-sum-of-squares.c.exe.valgrind.txt: unsuppressed errors: 1
 (...other results...)
 
-$ less testsuite/jit/test-sum-of-squares.exe.valgrind.txt
+$ less testsuite/jit/test-sum-of-squares.c.exe.valgrind.txt
 (...shows full valgrind report for this test case...)
 @end example
 

diff --git a/gcc/jit/docs/internals/index.rst b/gcc/jit/docs/internals/index.rst
index 1d46818d3972e6f6c67f08d6d9d906c4e89fe609..424c73ed241c3ab52c56566b6d138ed80d80357c 100644 (file)
--- a/gcc/jit/docs/internals/index.rst
+++ b/gcc/jit/docs/internals/index.rst
@@ -116,7 +116,7 @@ and once a test has been compiled, you can debug it directly:
            LD_LIBRARY_PATH=. \
            LIBRARY_PATH=. \
              gdb --args \
-               testsuite/jit/test-factorial.exe
+               testsuite/jit/test-factorial.c.exe
 
 Running under valgrind
 **********************
@@ -152,11 +152,11 @@ For example, the following invocation verbosely runs the testcase
 
   $ less testsuite/jit/jit.sum
   (...other results...)
-  XFAIL: jit.dg/test-sum-of-squares.c: test-sum-of-squares.exe.valgrind.txt: definitely lost: 8 bytes in 1 blocks
-  XFAIL: jit.dg/test-sum-of-squares.c: test-sum-of-squares.exe.valgrind.txt: unsuppressed errors: 1
+  XFAIL: jit.dg/test-sum-of-squares.c: test-sum-of-squares.c.exe.valgrind.txt: definitely lost: 8 bytes in 1 blocks
+  XFAIL: jit.dg/test-sum-of-squares.c: test-sum-of-squares.c.exe.valgrind.txt: unsuppressed errors: 1
   (...other results...)
 
-  $ less testsuite/jit/test-sum-of-squares.exe.valgrind.txt
+  $ less testsuite/jit/test-sum-of-squares.c.exe.valgrind.txt
   (...shows full valgrind report for this test case...)
 
 When running under valgrind, it's best to have configured gcc with

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 259d87f30eb59d2ee57246adf224861500c4cd13..c352a1d3b9b8d971fdeb3cebf17e9e96dc18573d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-07  David Malcolm  <dmalcolm@redhat.com>
+
+       * jit.dg/jit.exp (jit-dg-test): Remove "rootname" call when
+       generating name of built executable.
+
 2015-01-07  Marek Polacek  <polacek@redhat.com>
 
        PR c/64440

diff --git a/gcc/testsuite/jit.dg/jit.exp b/gcc/testsuite/jit.dg/jit.exp
index a37ccc7ba1aae279f40a105d61589d8dfdf0593d..307cc04a1bfa36d7363be629023dadd71f4c9ef7 100644 (file)
--- a/gcc/testsuite/jit.dg/jit.exp
+++ b/gcc/testsuite/jit.dg/jit.exp
@@ -302,7 +302,19 @@ proc jit-dg-test { prog do_what extra_tool_flags } {
     }
 
     # Determine what to name the built executable.
-    set output_file "[file rootname [file tail $prog]].exe"
+    #
+    # We simply append .exe to the filename, e.g.
+    #  "test-foo.c.exe"
+    # since some testcases exist in both
+    #  "test-foo.c" and
+    #  "test-foo.cc"
+    # variants, and we don't want them to clobber each other's
+    # executables.
+    #
+    # This also ensures that the source name makes it into the
+    # pass/fail output, so that we can distinguish e.g. which test-foo
+    # is failing.
+    set output_file "[file tail $prog].exe"
     verbose "output_file: $output_file"
 
     # Create the test executable: