binutils-gdb/libiberty/testsuite/test-expandargv.c

335 lines
8.3 KiB
C
Raw Normal View History

2006-01-21 05:28:49 +01:00
/* expandargv test program,
Update libiberty sources with changes in the gcc mainline. +2020-01-01 Jakub Jelinek <jakub@redhat.com> + + Update copyright years. + +2019-12-06 Tim Ruehsen <tim.ruehsen@gmx.de> + + * make-relative-prefix.c (split_directories): + Return early on empty 'name' + +2019-11-16 Tim Ruehsen <tim.ruehsen@gmx.de> + + * cp-demangle.c (d_print_init): Remove const from 4th param. + (cplus_demangle_fill_name): Initialize d->d_counting. + (cplus_demangle_fill_extended_operator): Likewise. + (cplus_demangle_fill_ctor): Likewise. + (cplus_demangle_fill_dtor): Likewise. + (d_make_empty): Likewise. + (d_count_templates_scopes): Remobe const from 3rd param, + Return on dc->d_counting > 1, + Increment dc->d_counting. + * cp-demint.c (cplus_demangle_fill_component): Initialize d->d_counting. + (cplus_demangle_fill_builtin_type): Likewise. + (cplus_demangle_fill_operator): Likewise. + +2019-11-16 Eduard-Mihai Burtescu <eddyb@lyken.rs> + + * cplus-dem.c (cplus_demangle): Use rust_demangle directly. + (rust_demangle): Remove. + * rust-demangle.c (is_prefixed_hash): Rename to is_legacy_prefixed_hash. + (parse_lower_hex_nibble): Rename to decode_lower_hex_nibble. + (parse_legacy_escape): Rename to decode_legacy_escape. + (rust_is_mangled): Remove. + (struct rust_demangler): Add. + (peek): Add. + (next): Add. + (struct rust_mangled_ident): Add. + (parse_ident): Add. + (rust_demangle_sym): Remove. + (print_str): Add. + (PRINT): Add. + (print_ident): Add. + (rust_demangle_callback): Add. + (struct str_buf): Add. + (str_buf_reserve): Add. + (str_buf_append): Add. + (str_buf_demangle_callback): Add. + (rust_demangle): Add. + * rust-demangle.h: Remove. + +2019-11-15 Miguel Saldivar <saldivarcher@gmail.com> + + * testsuite/demangle-expected: Fix test. + +2019-11-04 Kamlesh Kumar <kamleshbhalui@gmail.com> + + * cp-demangle.c (d_expr_primary): Handle + nullptr demangling. + * testsuite/demangle-expected: Added test. + +2019-10-29 Paul Pluzhnikov <ppluzhnikov@google.com> + + * cp-demangle.c (d_number): Avoid signed int overflow. + +2019-10-28 Miguel Saldivar <saldivarcher@gmail.com> + + * cp-demangle.c (d_print_mod): Add a space before printing `complex` + and `imaginary`, as opposed to after. + * testsuite/demangle-expected: Adjust test. + +2019-10-03 Eduard-Mihai Burtescu <eddyb@lyken.rs> + + * rust-demangle.c (looks_like_rust): Remove. + (rust_is_mangled): Don't check escapes. + (is_prefixed_hash): Allow 0-9a-f permutations. + (rust_demangle_sym): Don't bail on unknown escapes. + * testsuite/rust-demangle-expected: Update 'main::$99$' test. + +2019-09-03 Eduard-Mihai Burtescu <eddyb@lyken.rs> + + * rust-demangle.c (unescape): Remove. + (parse_lower_hex_nibble): New function. + (parse_legacy_escape): New function. + (is_prefixed_hash): Use parse_lower_hex_nibble. + (looks_like_rust): Use parse_legacy_escape. + (rust_demangle_sym): Use parse_legacy_escape. + * testsuite/rust-demangle-expected: Add 'llv$u6d$' test. + +2019-08-27 Martin Liska <mliska@suse.cz> + + PR lto/91478 + * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections): + First find a WEAK HIDDEN symbol in symbol table that will be + preserved. Later, use the symbol name for all removed symbols. + +2019-08-12 Martin Liska <mliska@suse.cz> + + * Makefile.in: Add filedescriptor.c. + * filedescriptor.c: New file. + * lrealpath.c (is_valid_fd): Remove. diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 0be45b4ae8..fe738d0db4 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -1,7 +1,7 @@ # Makefile for the libiberty library. # Originally written by K. Richard Pixley <rich@cygnus.com>. # -# Copyright (C) 1990-2019 Free Software Foundation, Inc. +# Copyright (C) 1990-2020 Free Software Foundation, Inc. # # This file is part of the libiberty library. # Libiberty is free software; you can redistribute it and/or @@ -127,7 +127,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \ calloc.c choose-temp.c clock.c concat.c cp-demangle.c \ cp-demint.c cplus-dem.c crc32.c \ d-demangle.c dwarfnames.c dyn-string.c \ - fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \ + fdmatch.c ffs.c fibheap.c filedescriptor.c filename_cmp.c floatformat.c \ fnmatch.c fopen_unlocked.c \ getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \ gettimeofday.c \ @@ -171,6 +171,7 @@ REQUIRED_OFILES = \ ./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext) \ ./dwarfnames.$(objext) ./dyn-string.$(objext) \ ./fdmatch.$(objext) ./fibheap.$(objext) \ + ./filedescriptor.$(objext) \ ./filename_cmp.$(objext) ./floatformat.$(objext) \ ./fnmatch.$(objext) ./fopen_unlocked.$(objext) \ ./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext) \ @@ -756,6 +757,17 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir else true; fi $(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION) +./filedescriptor.$(objext): $(srcdir)/filedescriptor.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/libiberty.h + if [ x"$(PICFLAG)" != x ]; then \ + $(COMPILE.c) $(PICFLAG) $(srcdir)/filedescriptor.c -o pic/$@; \ + else true; fi + if [ x"$(NOASANFLAG)" != x ]; then \ + $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/filedescriptor.c -o noasan/$@; \ + else true; fi + $(COMPILE.c) $(srcdir)/filedescriptor.c $(OUTPUT_OPTION) + + ./filename_cmp.$(objext): $(srcdir)/filename_cmp.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/safe-ctype.h diff --git a/libiberty/_doprnt.c b/libiberty/_doprnt.c index d44dc415ed..a739f4304f 100644 --- a/libiberty/_doprnt.c +++ b/libiberty/_doprnt.c @@ -1,5 +1,5 @@ /* Provide a version of _doprnt in terms of fprintf. - Copyright (C) 1998-2019 Free Software Foundation, Inc. + Copyright (C) 1998-2020 Free Software Foundation, Inc. Contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 3/29/98 This program is free software; you can redistribute it and/or modify it diff --git a/libiberty/argv.c b/libiberty/argv.c index 6444896f99..8c9794db6a 100644 --- a/libiberty/argv.c +++ b/libiberty/argv.c @@ -1,5 +1,5 @@ /* Create and destroy argument vectors (argv's) - Copyright (C) 1992-2019 Free Software Foundation, Inc. + Copyright (C) 1992-2020 Free Software Foundation, Inc. Written by Fred Fish @ Cygnus Support This file is part of the libiberty library. diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c index 5718682f69..6e38e2234d 100644 --- a/libiberty/asprintf.c +++ b/libiberty/asprintf.c @@ -1,6 +1,6 @@ /* Like sprintf but provides a pointer to malloc'd storage, which must be freed by the caller. - Copyright (C) 1997-2019 Free Software Foundation, Inc. + Copyright (C) 1997-2020 Free Software Foundation, Inc. Contributed by Cygnus Solutions. This file is part of the libiberty library. diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c index 72c1b710bd..49a2faaa51 100644 --- a/libiberty/choose-temp.c +++ b/libiberty/choose-temp.c @@ -1,5 +1,5 @@ /* Utility to pick a temporary filename prefix. - Copyright (C) 1996-2019 Free Software Foundation, Inc. + Copyright (C) 1996-2020 Free Software Foundation, Inc. This file is part of the libiberty library. Libiberty is free software; you can redistribute it and/or diff --git a/libiberty/clock.c b/libiberty/clock.c index a3730714bd..0de74657d0 100644 --- a/libiberty/clock.c +++ b/libiberty/clock.c @@ -1,5 +1,5 @@ /* ANSI-compatible clock function. - Copyright (C) 1994-2019 Free Software Foundation, Inc. + Copyright (C) 1994-2020 Free Software Foundation, Inc. This file is part of the libiberty library. This library is free software; you can redistribute it and/or modify it under the diff --git
2020-01-17 15:13:22 +01:00
Copyright (C) 2006-2020 Free Software Foundation, Inc.
2006-01-21 05:28:49 +01:00
Written by Carlos O'Donell <carlos@codesourcery.com>
This file is part of the libiberty library, which is part of GCC.
This file is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
In addition to the permissions in the GNU General Public License, the
Free Software Foundation gives you unlimited permission to link the
compiled version of this file into combinations with other programs,
and to distribute those combinations without any restriction coming
from the use of this file. (The General Public License restrictions
do apply in other respects; for example, they cover modification of
the file, and distribution when not linked into a combined
executable.)
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "libiberty.h"
#include <stdio.h>
#include <errno.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
2006-01-21 05:28:49 +01:00
#ifndef EXIT_SUCCESS
#define EXIT_SUCCESS 0
#endif
#ifndef EXIT_FAILURE
#define EXIT_FAILURE 1
#endif
static void fatal_error (int, const char *, int) ATTRIBUTE_NORETURN;
void writeout_test (int, const char *);
void run_replaces (char *);
void hook_char_replace (char *, size_t, char, char);
int run_tests (const char **);
void erase_test (int);
/* Test input data, argv before, and argv after:
The \n is an important part of test_data since expandargv
may have to work in environments where \n is translated
as \r\n. Thus \n is included in the test data for the file.
We use \b to indicate that the test data is the null character.
This is because we use \0 normally to represent the end of the
file data, so we need something else for this. */
#define FILENAME_PATTERN "test-expandargv-%d.lst"
#define ARGV0 "test-expandargv"
const char *test_data[] = {
/* Test 0 - Check for expansion with \r\n */
"a\r\nb", /* Test 0 data */
ARGV0,
"@test-expandargv-0.lst",
0, /* End of argv[] before expansion */
ARGV0,
"a",
"b",
0, /* End of argv[] after expansion */
/* Test 1 - Check for expansion with \n */
"a\nb", /* Test 1 data */
ARGV0,
"@test-expandargv-1.lst",
0,
ARGV0,
"a",
"b",
0,
/* Test 2 - Check for expansion with \0 */
"a\bb", /* Test 2 data */
ARGV0,
"@test-expandargv-2.lst",
0,
ARGV0,
"a",
0,
/* Test 3 - Check for expansion with only \0 */
"\b", /* Test 3 data */
ARGV0,
"@test-expandargv-3.lst",
0,
ARGV0,
0,
2009-10-09 06:49:52 +02:00
/* Test 4 - Check for options beginning with an empty line. */
"\na\nb", /* Test 4 data */
ARGV0,
"@test-expandargv-4.lst",
0,
ARGV0,
"a",
"b",
0,
/* Test 5 - Check for options containing an empty argument. */
"a\n''\nb", /* Test 5 data */
ARGV0,
"@test-expandargv-5.lst",
0,
ARGV0,
"a",
"",
"b",
0,
/* Test 6 - Check for options containing a quoted newline. */
"a\n'a\n\nb'\nb", /* Test 6 data */
ARGV0,
"@test-expandargv-6.lst",
0,
ARGV0,
"a",
"a\n\nb",
"b",
0,
2006-01-21 05:28:49 +01:00
0 /* Test done marker, don't remove. */
};
/* Print a fatal error and exit. LINE is the line number where we
detected the error, ERRMSG is the error message to print, and ERR
is 0 or an errno value to print. */
static void
fatal_error (int line, const char *errmsg, int err)
{
fprintf (stderr, "test-expandargv:%d: %s", line, errmsg);
if (errno != 0)
fprintf (stderr, ": %s", xstrerror (err));
fprintf (stderr, "\n");
exit (EXIT_FAILURE);
}
/* hook_char_replace:
Replace 'replacethis' with 'withthis' */
void
hook_char_replace (char *string, size_t len, char replacethis, char withthis)
{
int i = 0;
for (i = 0; i < len; i++)
if (string[i] == replacethis)
string[i] = withthis;
}
/* run_replaces:
Hook here all the character for character replaces.
Be warned that expanding the string or contracting the string
should be handled with care. */
void
run_replaces (char * string)
{
/* Store original string size */
size_t len = strlen (string);
hook_char_replace (string, len, '\b', '\0');
}
/* write_test:
Write test datafile */
void
writeout_test (int test, const char * test_data)
{
char filename[256];
FILE *fd;
2011-08-06 20:40:27 +02:00
size_t len, sys_fwrite;
2006-01-21 05:28:49 +01:00
char * parse;
/* Unique filename per test */
sprintf (filename, FILENAME_PATTERN, test);
fd = fopen (filename, "w");
if (fd == NULL)
fatal_error (__LINE__, "Failed to create test file.", errno);
/* Generate RW copy of data for replaces */
len = strlen (test_data);
parse = malloc (sizeof (char) * (len + 1));
if (parse == NULL)
fatal_error (__LINE__, "Failed to malloc parse.", errno);
2011-04-10 21:15:10 +02:00
memcpy (parse, test_data, sizeof (char) * (len + 1));
2006-01-21 05:28:49 +01:00
/* Run all possible replaces */
run_replaces (parse);
2011-08-06 20:40:27 +02:00
sys_fwrite = fwrite (parse, sizeof (char), len, fd);
if (sys_fwrite != len)
fatal_error (__LINE__, "Failed to write to test file.", errno);
2006-01-21 05:28:49 +01:00
free (parse);
fclose (fd);
}
/* erase_test:
Erase the test file */
void
erase_test (int test)
{
char filename[256];
sprintf (filename, FILENAME_PATTERN, test);
if (unlink (filename) != 0)
fatal_error (__LINE__, "Failed to erase test file.", errno);
}
/* run_tests:
Run expandargv
Compare argv before and after.
Return number of fails */
int
run_tests (const char **test_data)
{
int argc_after, argc_before;
char ** argv_before, ** argv_after;
int i, j, k, fails, failed;
i = j = fails = 0;
/* Loop over all the tests */
while (test_data[j])
{
/* Write test data */
writeout_test (i, test_data[j++]);
/* Copy argv before */
argv_before = dupargv ((char **) &test_data[j]);
/* Count argc before/after */
argc_before = 0;
argc_after = 0;
while (test_data[j + argc_before])
argc_before++;
j += argc_before + 1; /* Skip null */
while (test_data[j + argc_after])
argc_after++;
/* Copy argv after */
argv_after = dupargv ((char **) &test_data[j]);
/* Run all possible replaces */
for (k = 0; k < argc_before; k++)
run_replaces (argv_before[k]);
for (k = 0; k < argc_after; k++)
run_replaces (argv_after[k]);
/* Run test: Expand arguments */
expandargv (&argc_before, &argv_before);
failed = 0;
/* Compare size first */
if (argc_before != argc_after)
{
printf ("FAIL: test-expandargv-%d. Number of arguments don't match.\n", i);
failed++;
}
/* Compare each of the argv's ... */
else
for (k = 0; k < argc_after; k++)
2009-10-09 06:49:52 +02:00
if (strcmp (argv_before[k], argv_after[k]) != 0)
2006-01-21 05:28:49 +01:00
{
printf ("FAIL: test-expandargv-%d. Arguments don't match.\n", i);
failed++;
}
if (!failed)
printf ("PASS: test-expandargv-%d.\n", i);
else
fails++;
freeargv (argv_before);
freeargv (argv_after);
/* Advance to next test */
j += argc_after + 1;
/* Erase test file */
erase_test (i);
i++;
}
return fails;
}
/* main:
Run tests.
Check result and exit with appropriate code. */
int
main(int argc, char **argv)
{
int fails;
/* Repeat for all the tests:
- Parse data array and write into file.
- Run replace hooks before writing to file.
- Parse data array and build argv before/after.
- Run replace hooks on argv before/after
- Run expandargv.
- Compare output of expandargv argv to after argv.
- If they compare the same then test passes
else the test fails.
- Erase test file. */
fails = run_tests (test_data);
if (!fails)
exit (EXIT_SUCCESS);
else
exit (EXIT_FAILURE);
}