From patchwork Tue Feb 18 12:43:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Strasuns, Mihails" X-Patchwork-Id: 38202 Received: (qmail 112588 invoked by alias); 18 Feb 2020 12:42:45 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 112488 invoked by uid 89); 18 Feb 2020 12:42:44 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy=deb X-HELO: mga03.intel.com Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 18 Feb 2020 12:42:42 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2020 04:42:39 -0800 Received: from labpc7920x-08.iul.intel.com (HELO localhost) ([172.28.49.153]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2020 04:42:39 -0800 From: Mihails Strasuns To: gdb-patches@sourceware.org Cc: Mihails Strasuns Subject: [PATCH 2/7] [gdb/testsuite] structured rename of jit test files Date: Tue, 18 Feb 2020 13:43:34 +0100 Message-Id: <20200218124339.11270-3-mihails.strasuns@intel.com> In-Reply-To: <20200218124339.11270-1-mihails.strasuns@intel.com> References: <20200218124339.11270-1-mihails.strasuns@intel.com> MIME-Version: 1.0 X-IsSubscribed: yes Reorganizes how JIT related test files to be more clear what are related to JIT reader system tests and what use JIT from ELF objfiles. Those two approaches are quite different in GDB implementation and require very different test setup. Keeping distinction clear at the file name level makes it easier to maintain the testsuite. gdb/testsuite/ChangeLog: 2020-02-18 Mihails Strasuns * gdb.base: rename all jit related test and source files Signed-off-by: Mihails Strasuns Change-Id: I51524c2791744ebad4ea7cb45185ee4e2cd97993 --- gdb/testsuite/gdb.base/{jit-dlmain.c => jit-elf-dlmain.c} | 0 gdb/testsuite/gdb.base/{jit-main.c => jit-elf-main.c} | 0 gdb/testsuite/gdb.base/{jit-so.exp => jit-elf-so.exp} | 6 +++--- gdb/testsuite/gdb.base/{jit-solib.c => jit-elf-solib.c} | 0 gdb/testsuite/gdb.base/{jit.exp => jit-elf.exp} | 4 ++-- gdb/testsuite/gdb.base/{jit-exec.c => jit-reader-exec.c} | 2 +- .../gdb.base/{jit-exec.exp => jit-reader-exec.exp} | 4 ++-- gdb/testsuite/gdb.base/{jit-execd.c => jit-reader-execd.c} | 0 gdb/testsuite/gdb.base/{jithost.c => jit-reader-host.c} | 2 +- gdb/testsuite/gdb.base/{jithost.h => jit-reader-host.h} | 0 .../gdb.base/{jit-simple-dl.c => jit-reader-simple-dl.c} | 0 .../gdb.base/{jit-simple-jit.c => jit-reader-simple-jit.c} | 0 .../gdb.base/{jit-simple.c => jit-reader-simple.c} | 2 +- .../gdb.base/{jit-simple.exp => jit-reader-simple.exp} | 0 gdb/testsuite/gdb.base/{jitreader.c => jit-reader.c} | 2 +- gdb/testsuite/gdb.base/jit-reader.exp | 4 ++-- 16 files changed, 13 insertions(+), 13 deletions(-) rename gdb/testsuite/gdb.base/{jit-dlmain.c => jit-elf-dlmain.c} (100%) rename gdb/testsuite/gdb.base/{jit-main.c => jit-elf-main.c} (100%) rename gdb/testsuite/gdb.base/{jit-so.exp => jit-elf-so.exp} (97%) rename gdb/testsuite/gdb.base/{jit-solib.c => jit-elf-solib.c} (100%) rename gdb/testsuite/gdb.base/{jit.exp => jit-elf.exp} (98%) rename gdb/testsuite/gdb.base/{jit-exec.c => jit-reader-exec.c} (96%) rename gdb/testsuite/gdb.base/{jit-exec.exp => jit-reader-exec.exp} (95%) rename gdb/testsuite/gdb.base/{jit-execd.c => jit-reader-execd.c} (100%) rename gdb/testsuite/gdb.base/{jithost.c => jit-reader-host.c} (99%) rename gdb/testsuite/gdb.base/{jithost.h => jit-reader-host.h} (100%) rename gdb/testsuite/gdb.base/{jit-simple-dl.c => jit-reader-simple-dl.c} (100%) rename gdb/testsuite/gdb.base/{jit-simple-jit.c => jit-reader-simple-jit.c} (100%) rename gdb/testsuite/gdb.base/{jit-simple.c => jit-reader-simple.c} (96%) rename gdb/testsuite/gdb.base/{jit-simple.exp => jit-reader-simple.exp} (100%) rename gdb/testsuite/gdb.base/{jitreader.c => jit-reader.c} (99%) diff --git a/gdb/testsuite/gdb.base/jit-dlmain.c b/gdb/testsuite/gdb.base/jit-elf-dlmain.c similarity index 100% rename from gdb/testsuite/gdb.base/jit-dlmain.c rename to gdb/testsuite/gdb.base/jit-elf-dlmain.c diff --git a/gdb/testsuite/gdb.base/jit-main.c b/gdb/testsuite/gdb.base/jit-elf-main.c similarity index 100% rename from gdb/testsuite/gdb.base/jit-main.c rename to gdb/testsuite/gdb.base/jit-elf-main.c diff --git a/gdb/testsuite/gdb.base/jit-so.exp b/gdb/testsuite/gdb.base/jit-elf-so.exp similarity index 97% rename from gdb/testsuite/gdb.base/jit-so.exp rename to gdb/testsuite/gdb.base/jit-elf-so.exp index 27dcdfa58e..526414f43c 100644 --- a/gdb/testsuite/gdb.base/jit-so.exp +++ b/gdb/testsuite/gdb.base/jit-elf-so.exp @@ -30,7 +30,7 @@ if {[get_compiler_info]} { # test running programs # -set testfile jit-dlmain +set testfile jit-elf-dlmain set srcfile ${testfile}.c set binfile [standard_output_file ${testfile}] if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug shlib_load}] != "" } { @@ -38,7 +38,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb return -1 } -set testfile2 jit-main +set testfile2 jit-elf-main set srcfile2 ${testfile2}.c set binfile2 [standard_output_file ${testfile2}.so] set binfile2_dlopen [shlib_target_file ${testfile2}.so] @@ -47,7 +47,7 @@ if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug add return -1 } -set solib_testfile "jit-solib" +set solib_testfile "jit-elf-solib" set solib_srcfile "${srcdir}/${subdir}/${solib_testfile}.c" set solib_binfile [standard_output_file ${solib_testfile}.so] set solib_binfile_test_msg "SHLIBDIR/${solib_testfile}.so" diff --git a/gdb/testsuite/gdb.base/jit-solib.c b/gdb/testsuite/gdb.base/jit-elf-solib.c similarity index 100% rename from gdb/testsuite/gdb.base/jit-solib.c rename to gdb/testsuite/gdb.base/jit-elf-solib.c diff --git a/gdb/testsuite/gdb.base/jit.exp b/gdb/testsuite/gdb.base/jit-elf.exp similarity index 98% rename from gdb/testsuite/gdb.base/jit.exp rename to gdb/testsuite/gdb.base/jit-elf.exp index 094c37fa3d..71d3e37dfb 100644 --- a/gdb/testsuite/gdb.base/jit.exp +++ b/gdb/testsuite/gdb.base/jit-elf.exp @@ -33,7 +33,7 @@ proc compile_jit_test {testname binsuffix options} { global solib_testfile solib_srcfile solib_binfile solib_binfile_test_msg global solib_binfile_target - set testfile jit-main + set testfile jit-elf-main set srcfile ${testfile}.c set binfile [standard_output_file $testfile$binsuffix] if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ @@ -42,7 +42,7 @@ proc compile_jit_test {testname binsuffix options} { return -1 } - set solib_testfile "jit-solib" + set solib_testfile "jit-elf-solib" set solib_srcfile "${srcdir}/${subdir}/${solib_testfile}.c" set solib_binfile [standard_output_file ${solib_testfile}$binsuffix.so] set solib_binfile_test_msg "SHLIBDIR/${solib_testfile}$binsuffix.so" diff --git a/gdb/testsuite/gdb.base/jit-exec.c b/gdb/testsuite/gdb.base/jit-reader-exec.c similarity index 96% rename from gdb/testsuite/gdb.base/jit-exec.c rename to gdb/testsuite/gdb.base/jit-reader-exec.c index 809308fabe..f92aa5d9da 100644 --- a/gdb/testsuite/gdb.base/jit-exec.c +++ b/gdb/testsuite/gdb.base/jit-reader-exec.c @@ -17,7 +17,7 @@ /* Simple standalone program using the JIT API. */ -#include "jit-simple-jit.c" +#include "jit-reader-simple-jit.c" #include int diff --git a/gdb/testsuite/gdb.base/jit-exec.exp b/gdb/testsuite/gdb.base/jit-reader-exec.exp similarity index 95% rename from gdb/testsuite/gdb.base/jit-exec.exp rename to gdb/testsuite/gdb.base/jit-reader-exec.exp index 327646bb65..4235309f77 100644 --- a/gdb/testsuite/gdb.base/jit-exec.exp +++ b/gdb/testsuite/gdb.base/jit-reader-exec.exp @@ -21,9 +21,9 @@ if { ![istarget "*-linux*"] } then { return } -standard_testfile jit-exec.c +standard_testfile jit-reader-exec.c -set testfile2 "jit-execd" +set testfile2 "jit-reader-execd" set srcfile2 ${testfile2}.c set binfile2 [standard_output_file ${testfile2}] diff --git a/gdb/testsuite/gdb.base/jit-execd.c b/gdb/testsuite/gdb.base/jit-reader-execd.c similarity index 100% rename from gdb/testsuite/gdb.base/jit-execd.c rename to gdb/testsuite/gdb.base/jit-reader-execd.c diff --git a/gdb/testsuite/gdb.base/jithost.c b/gdb/testsuite/gdb.base/jit-reader-host.c similarity index 99% rename from gdb/testsuite/gdb.base/jithost.c rename to gdb/testsuite/gdb.base/jit-reader-host.c index 19cc3e16c0..d07acd54bb 100644 --- a/gdb/testsuite/gdb.base/jithost.c +++ b/gdb/testsuite/gdb.base/jit-reader-host.c @@ -23,7 +23,7 @@ #include #include JIT_READER_H /* Please see jit-reader.exp for an explanation. */ -#include "jithost.h" +#include "jit-reader-host.h" #include "jit-protocol.h" void __attribute__((noinline)) __jit_debug_register_code () { } diff --git a/gdb/testsuite/gdb.base/jithost.h b/gdb/testsuite/gdb.base/jit-reader-host.h similarity index 100% rename from gdb/testsuite/gdb.base/jithost.h rename to gdb/testsuite/gdb.base/jit-reader-host.h diff --git a/gdb/testsuite/gdb.base/jit-simple-dl.c b/gdb/testsuite/gdb.base/jit-reader-simple-dl.c similarity index 100% rename from gdb/testsuite/gdb.base/jit-simple-dl.c rename to gdb/testsuite/gdb.base/jit-reader-simple-dl.c diff --git a/gdb/testsuite/gdb.base/jit-simple-jit.c b/gdb/testsuite/gdb.base/jit-reader-simple-jit.c similarity index 100% rename from gdb/testsuite/gdb.base/jit-simple-jit.c rename to gdb/testsuite/gdb.base/jit-reader-simple-jit.c diff --git a/gdb/testsuite/gdb.base/jit-simple.c b/gdb/testsuite/gdb.base/jit-reader-simple.c similarity index 96% rename from gdb/testsuite/gdb.base/jit-simple.c rename to gdb/testsuite/gdb.base/jit-reader-simple.c index 8ea6aec1f1..bcb83f09bf 100644 --- a/gdb/testsuite/gdb.base/jit-simple.c +++ b/gdb/testsuite/gdb.base/jit-reader-simple.c @@ -17,7 +17,7 @@ /* Simple standalone program using the JIT API. */ -#include "jit-simple-jit.c" +#include "jit-reader-simple-jit.c" int main (void) diff --git a/gdb/testsuite/gdb.base/jit-simple.exp b/gdb/testsuite/gdb.base/jit-reader-simple.exp similarity index 100% rename from gdb/testsuite/gdb.base/jit-simple.exp rename to gdb/testsuite/gdb.base/jit-reader-simple.exp diff --git a/gdb/testsuite/gdb.base/jitreader.c b/gdb/testsuite/gdb.base/jit-reader.c similarity index 99% rename from gdb/testsuite/gdb.base/jitreader.c rename to gdb/testsuite/gdb.base/jit-reader.c index d0dc488fec..c5fd7a99be 100644 --- a/gdb/testsuite/gdb.base/jitreader.c +++ b/gdb/testsuite/gdb.base/jit-reader.c @@ -21,7 +21,7 @@ #include #include JIT_READER_H /* Please see jit-reader.exp for an explanation. */ -#include "jithost.h" +#include "jit-reader-host.h" GDB_DECLARE_GPL_COMPATIBLE_READER; diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp index 5140e3d930..6f90d6ebdf 100644 --- a/gdb/testsuite/gdb.base/jit-reader.exp +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -standard_testfile jithost.c +standard_testfile jit-reader-host.c if { (![istarget x86_64-*-*] && ![istarget i?86-*-*]) || ![is_lp64_target] } { return -1; @@ -47,7 +47,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \ return -1 } -set jit_reader jitreader +set jit_reader jit-reader set jit_reader_src ${jit_reader}.c set jit_reader_bin [standard_output_file ${jit_reader}.so]