diff --git a/test/asm/listing/001-macro-simple-listing.list-ref b/test/asm/listing/001-macro-simple-listing.list-ref index 72849ea11..268862e80 100644 --- a/test/asm/listing/001-macro-simple-listing.list-ref +++ b/test/asm/listing/001-macro-simple-listing.list-ref @@ -1,3 +1,4 @@ +ca65 Vx.xx - Git XXXXXXXXX Main file : 001-macro-simple-listing.s Current file: 001-macro-simple-listing.s diff --git a/test/asm/listing/002-macro-param-listing.list-ref b/test/asm/listing/002-macro-param-listing.list-ref index 25d67d504..f538ca197 100644 --- a/test/asm/listing/002-macro-param-listing.list-ref +++ b/test/asm/listing/002-macro-param-listing.list-ref @@ -1,3 +1,4 @@ +ca65 Vx.xx - Git XXXXXXXXX Main file : 002-macro-param-listing.s Current file: 002-macro-param-listing.s diff --git a/test/asm/listing/020-asciiz.list-ref b/test/asm/listing/020-asciiz.list-ref index a090f06a4..7b2f9d2f4 100644 --- a/test/asm/listing/020-asciiz.list-ref +++ b/test/asm/listing/020-asciiz.list-ref @@ -1,3 +1,4 @@ +ca65 Vx.xx - Git XXXXXXXXX Main file : 020-asciiz.s Current file: 020-asciiz.s diff --git a/test/asm/listing/100-byte.list-ref b/test/asm/listing/100-byte.list-ref index 1c091efff..4885dfd53 100644 --- a/test/asm/listing/100-byte.list-ref +++ b/test/asm/listing/100-byte.list-ref @@ -1,3 +1,4 @@ +ca65 Vx.xx - Git XXXXXXXXX Main file : 100-byte.s Current file: 100-byte.s diff --git a/test/asm/listing/101-byt.list-ref b/test/asm/listing/101-byt.list-ref index 796c8e6a1..43677a703 100644 --- a/test/asm/listing/101-byt.list-ref +++ b/test/asm/listing/101-byt.list-ref @@ -1,3 +1,4 @@ +ca65 Vx.xx - Git XXXXXXXXX Main file : 101-byt.s Current file: 101-byt.s diff --git a/test/asm/listing/102-word.list-ref b/test/asm/listing/102-word.list-ref index 3d55bc3fb..5c5d4e9e5 100644 --- a/test/asm/listing/102-word.list-ref +++ b/test/asm/listing/102-word.list-ref @@ -1,3 +1,4 @@ +ca65 Vx.xx - Git XXXXXXXXX Main file : 102-word.s Current file: 102-word.s diff --git a/test/asm/listing/103-dbyt.list-ref b/test/asm/listing/103-dbyt.list-ref index 4d06dbe26..211ec8280 100644 --- a/test/asm/listing/103-dbyt.list-ref +++ b/test/asm/listing/103-dbyt.list-ref @@ -1,3 +1,4 @@ +ca65 Vx.xx - Git XXXXXXXXX Main file : 103-dbyt.s Current file: 103-dbyt.s diff --git a/test/asm/listing/104-dword.list-ref b/test/asm/listing/104-dword.list-ref index b449b45a8..9f52412d8 100644 --- a/test/asm/listing/104-dword.list-ref +++ b/test/asm/listing/104-dword.list-ref @@ -1,3 +1,4 @@ +ca65 Vx.xx - Git XXXXXXXXX Main file : 104-dword.s Current file: 104-dword.s diff --git a/test/asm/listing/105-faraddr.list-ref b/test/asm/listing/105-faraddr.list-ref index 5a8966de9..86f534b76 100644 --- a/test/asm/listing/105-faraddr.list-ref +++ b/test/asm/listing/105-faraddr.list-ref @@ -1,3 +1,4 @@ +ca65 Vx.xx - Git XXXXXXXXX Main file : 105-faraddr.s Current file: 105-faraddr.s diff --git a/test/asm/listing/106-hibytes.list-ref b/test/asm/listing/106-hibytes.list-ref index d4c4272af..ddd9146de 100644 --- a/test/asm/listing/106-hibytes.list-ref +++ b/test/asm/listing/106-hibytes.list-ref @@ -1,3 +1,4 @@ +ca65 Vx.xx - Git XXXXXXXXX Main file : 106-hibytes.s Current file: 106-hibytes.s diff --git a/test/asm/listing/107-lobytes.list-ref b/test/asm/listing/107-lobytes.list-ref index 3511c91d8..c4b5f27d3 100644 --- a/test/asm/listing/107-lobytes.list-ref +++ b/test/asm/listing/107-lobytes.list-ref @@ -1,3 +1,4 @@ +ca65 Vx.xx - Git XXXXXXXXX Main file : 107-lobytes.s Current file: 107-lobytes.s diff --git a/test/asm/listing/Makefile b/test/asm/listing/Makefile index 24b4c2d0e..272a6904c 100644 --- a/test/asm/listing/Makefile +++ b/test/asm/listing/Makefile @@ -106,7 +106,7 @@ ifneq ($(wildcard $1.list-ref),) # we have a reference file, compare that, too # remove first line which contains a version number - $(ISEQUAL) --skipright=1 $1.list-ref $$(@:.bin=.lst) + $(ISEQUAL) --skip=1 $1.list-ref $$(@:.bin=.lst) endif endef # LISTING_template diff --git a/test/isequal.c b/test/isequal.c index e71416180..2d6cf5253 100644 --- a/test/isequal.c +++ b/test/isequal.c @@ -36,9 +36,11 @@ int handleparameter(int argc, char *argv[]) static const char opt_empty[] = "--empty"; static const char opt_skipleft[] = "--skipleft"; static const char opt_skipright[] = "--skipright"; + static const char opt_skip[] = "--skip"; static const char len_skipleft = sizeof opt_skipleft - 1; static const char len_skipright = sizeof opt_skipright - 1; + static const char len_skip = sizeof opt_skip - 1; int argindex = 1; @@ -81,6 +83,16 @@ int handleparameter(int argc, char *argv[]) fprintf(stderr, "%s: you must specify the number of lines\n", opt_skipright); } } + else if (strncmp(argv[argindex], opt_skip, len_skip) == 0) { + if (binary || empty) { + fprintf(stderr, "%s cannot go with other options.\n", opt_skipright); + exit(1); + } + skiplines_left = skiplines_right = handleargparameter(len_skip, argv[argindex]); + if (skiplines_left < 0) { + fprintf(stderr, "%s: you must specify the number of lines\n", opt_skip); + } + } ++argindex; }