From baa3b160ce96ec5e19d8a74b62fbb11bf668ff2f Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Tue, 21 Jul 2026 07:31:42 +0200 Subject: [PATCH] Don't output absolute output path in binfmt mapfile for tests (#305) --- modules/objfmts/bin/bin-objfmt.c | 11 ++++++++++- modules/objfmts/bin/tests/multisect/bin-align.map | 2 +- modules/objfmts/bin/tests/multisect/bin-ssym.map | 2 +- modules/objfmts/bin/tests/multisect/initbss.map | 2 +- modules/objfmts/bin/tests/multisect/ldlinux-sects.map | 2 +- modules/objfmts/bin/tests/multisect/multisect1.map | 2 +- modules/objfmts/bin/tests/multisect/multisect2.map | 2 +- modules/objfmts/bin/tests/multisect/multisect3.map | 2 +- modules/objfmts/bin/tests/multisect/multisect4.map | 2 +- modules/objfmts/bin/tests/multisect/multisect5.map | 2 +- modules/objfmts/bin/tests/multisect/nomultisect1.map | 2 +- modules/objfmts/bin/tests/multisect/nomultisect2.map | 2 +- modules/parsers/nasm/tests/worphan/orphanwarn.errwarn | 4 ++-- 13 files changed, 23 insertions(+), 14 deletions(-) diff --git a/modules/objfmts/bin/bin-objfmt.c b/modules/objfmts/bin/bin-objfmt.c index a38c3422..c5abd87a 100644 --- a/modules/objfmts/bin/bin-objfmt.c +++ b/modules/objfmts/bin/bin-objfmt.c @@ -30,6 +30,7 @@ #include #endif #include +#include #define REGULAR_OUTBUF_SIZE 1024 @@ -778,7 +779,15 @@ output_map(bin_objfmt_output_info *info) for (i=0; i<63; i++) fputc('-', f); fprintf(f, "\n\nSource file: %s\n", info->object->src_filename); - fprintf(f, "Output file: %s\n\n", info->object->obj_filename); + if (getenv("YASM_TEST_SUITE")) { + const char *filename = info->object->obj_filename; + const char *next_filename; + while ((next_filename = strpbrk(filename, "/\\"))) + filename = next_filename + 1; + fprintf(f, "Output file: %s\n\n", filename); + } else { + fprintf(f, "Output file: %s\n\n", info->object->obj_filename); + } fprintf(f, "-- Program origin "); for (i=0; i<61; i++) diff --git a/modules/objfmts/bin/tests/multisect/bin-align.map b/modules/objfmts/bin/tests/multisect/bin-align.map index 3031bd15..bb5a8f23 100644 --- a/modules/objfmts/bin/tests/multisect/bin-align.map +++ b/modules/objfmts/bin/tests/multisect/bin-align.map @@ -2,7 +2,7 @@ - YASM Map file --------------------------------------------------------------- Source file: - -Output file: results/bin-align +Output file: bin-align -- Program origin ------------------------------------------------------------- diff --git a/modules/objfmts/bin/tests/multisect/bin-ssym.map b/modules/objfmts/bin/tests/multisect/bin-ssym.map index 9ddfe168..112dc02b 100644 --- a/modules/objfmts/bin/tests/multisect/bin-ssym.map +++ b/modules/objfmts/bin/tests/multisect/bin-ssym.map @@ -2,7 +2,7 @@ - YASM Map file --------------------------------------------------------------- Source file: - -Output file: results/bin-ssym +Output file: bin-ssym -- Program origin ------------------------------------------------------------- diff --git a/modules/objfmts/bin/tests/multisect/initbss.map b/modules/objfmts/bin/tests/multisect/initbss.map index d26734de..dc444f56 100644 --- a/modules/objfmts/bin/tests/multisect/initbss.map +++ b/modules/objfmts/bin/tests/multisect/initbss.map @@ -2,7 +2,7 @@ - YASM Map file --------------------------------------------------------------- Source file: - -Output file: results/initbss +Output file: initbss -- Program origin ------------------------------------------------------------- diff --git a/modules/objfmts/bin/tests/multisect/ldlinux-sects.map b/modules/objfmts/bin/tests/multisect/ldlinux-sects.map index 03fde845..3a5e33e3 100644 --- a/modules/objfmts/bin/tests/multisect/ldlinux-sects.map +++ b/modules/objfmts/bin/tests/multisect/ldlinux-sects.map @@ -2,7 +2,7 @@ - YASM Map file --------------------------------------------------------------- Source file: - -Output file: results/ldlinux-sects +Output file: ldlinux-sects -- Program origin ------------------------------------------------------------- diff --git a/modules/objfmts/bin/tests/multisect/multisect1.map b/modules/objfmts/bin/tests/multisect/multisect1.map index 0a56e413..f52da415 100644 --- a/modules/objfmts/bin/tests/multisect/multisect1.map +++ b/modules/objfmts/bin/tests/multisect/multisect1.map @@ -2,7 +2,7 @@ - YASM Map file --------------------------------------------------------------- Source file: - -Output file: results/multisect1 +Output file: multisect1 -- Program origin ------------------------------------------------------------- diff --git a/modules/objfmts/bin/tests/multisect/multisect2.map b/modules/objfmts/bin/tests/multisect/multisect2.map index 82002edb..858da399 100644 --- a/modules/objfmts/bin/tests/multisect/multisect2.map +++ b/modules/objfmts/bin/tests/multisect/multisect2.map @@ -2,7 +2,7 @@ - YASM Map file --------------------------------------------------------------- Source file: - -Output file: results/multisect2 +Output file: multisect2 -- Program origin ------------------------------------------------------------- diff --git a/modules/objfmts/bin/tests/multisect/multisect3.map b/modules/objfmts/bin/tests/multisect/multisect3.map index 1c67c227..a3f651b2 100644 --- a/modules/objfmts/bin/tests/multisect/multisect3.map +++ b/modules/objfmts/bin/tests/multisect/multisect3.map @@ -2,7 +2,7 @@ - YASM Map file --------------------------------------------------------------- Source file: - -Output file: results/multisect3 +Output file: multisect3 -- Program origin ------------------------------------------------------------- diff --git a/modules/objfmts/bin/tests/multisect/multisect4.map b/modules/objfmts/bin/tests/multisect/multisect4.map index e1940dc6..bb97c9f2 100644 --- a/modules/objfmts/bin/tests/multisect/multisect4.map +++ b/modules/objfmts/bin/tests/multisect/multisect4.map @@ -2,7 +2,7 @@ - YASM Map file --------------------------------------------------------------- Source file: - -Output file: results/multisect4 +Output file: multisect4 -- Program origin ------------------------------------------------------------- diff --git a/modules/objfmts/bin/tests/multisect/multisect5.map b/modules/objfmts/bin/tests/multisect/multisect5.map index 4c052be6..e5c972a3 100644 --- a/modules/objfmts/bin/tests/multisect/multisect5.map +++ b/modules/objfmts/bin/tests/multisect/multisect5.map @@ -2,7 +2,7 @@ - YASM Map file --------------------------------------------------------------- Source file: - -Output file: results/multisect5 +Output file: multisect5 -- Program origin ------------------------------------------------------------- diff --git a/modules/objfmts/bin/tests/multisect/nomultisect1.map b/modules/objfmts/bin/tests/multisect/nomultisect1.map index 89974207..0745189b 100644 --- a/modules/objfmts/bin/tests/multisect/nomultisect1.map +++ b/modules/objfmts/bin/tests/multisect/nomultisect1.map @@ -2,7 +2,7 @@ - YASM Map file --------------------------------------------------------------- Source file: - -Output file: results/nomultisect1 +Output file: nomultisect1 -- Program origin ------------------------------------------------------------- diff --git a/modules/objfmts/bin/tests/multisect/nomultisect2.map b/modules/objfmts/bin/tests/multisect/nomultisect2.map index cc6d9c87..7a9d306f 100644 --- a/modules/objfmts/bin/tests/multisect/nomultisect2.map +++ b/modules/objfmts/bin/tests/multisect/nomultisect2.map @@ -2,7 +2,7 @@ - YASM Map file --------------------------------------------------------------- Source file: - -Output file: results/nomultisect2 +Output file: nomultisect2 -- Program origin ------------------------------------------------------------- diff --git a/modules/parsers/nasm/tests/worphan/orphanwarn.errwarn b/modules/parsers/nasm/tests/worphan/orphanwarn.errwarn index 0953e811..d0071f2c 100644 --- a/modules/parsers/nasm/tests/worphan/orphanwarn.errwarn +++ b/modules/parsers/nasm/tests/worphan/orphanwarn.errwarn @@ -1,2 +1,2 @@ --:2: warning: label alone on aline without a colon might be in error --:3: warning: label alone on aline without a colon might be in error +-:2: warning: label alone on a line without a colon might be in error +-:3: warning: label alone on a line without a colon might be in error