This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PING: [PATCH] Add --enable-hardcoded-path-in-tests configure option


On Wed, Jan 2, 2013 at 7:01 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Thu, Dec 20, 2012 at 03:01:58PM -0500, Carlos O'Donell wrote:
>> On 12/20/2012 02:56 PM, H.J. Lu wrote:
>> >On Thu, Dec 20, 2012 at 11:49 AM, Carlos O'Donell
>> ><carlos@systemhalted.org> wrote:
>> >>
>> >>In summary: Please finish up the bike-shed about the name of the option and
>> >>I think you're ready (barring any other reviews).
>> >>
>> >
>> >The choices are
>> >
>> >1. --enable-dynamic-test.
>> >2. --enable-hardcode-build-in-tests
>> >3. --enable-hardcoded-tests.
>> >4. --enable-hardcoded-test-paths.
>> >5. --enable-hardcoded-path-in-tests
>> >
>> >Let's take a vote.  I vote for 3 and 5.
>>
>> I vote for 5.
>>
>> Cheers,
>> Carlos.
>>
>>
>
> Here is the patch.  OK to install?
>
> Thanks.
>
>
> H.J.
> ---
>  Makeconfig                  |  83 ++++++++++++++++++++++++++++++------
>  Makefile                    |   2 +-
>  Makerules                   |   8 ++--
>  Rules                       |  23 +++++++---
>  catgets/Makefile            |   2 +-
>  catgets/test-gencat.sh      |   4 +-
>  config.make.in              |   1 +
>  configure                   |  14 ++++++
>  configure.in                |   7 +++
>  elf/Makefile                |  32 ++++++--------
>  grp/Makefile                |   2 +-
>  grp/tst_fgetgrent.sh        |  10 ++---
>  iconvdata/Makefile          |   2 +-
>  iconvdata/tst-table.sh      |   6 +--
>  iconvdata/tst-tables.sh     |   4 +-
>  intl/Makefile               |  10 ++---
>  intl/tst-gettext.sh         |   4 +-
>  intl/tst-gettext2.sh        |   4 +-
>  intl/tst-gettext4.sh        |   4 +-
>  intl/tst-gettext6.sh        |   4 +-
>  intl/tst-translit.sh        |   4 +-
>  io/Makefile                 |   2 +-
>  libio/Makefile              |   2 +-
>  libio/test-freopen.sh       |   4 +-
>  localedata/Makefile         |  21 ++++-----
>  localedata/sort-test.sh     |   6 +--
>  localedata/tst-fmon.sh      |   5 ++-
>  localedata/tst-mbswcs.sh    |  12 +++---
>  localedata/tst-numeric.sh   |   4 +-
>  localedata/tst-trans.sh     |   3 +-
>  malloc/Makefile             |   2 +-
>  malloc/tst-mtrace.sh        |   4 +-
>  manual/install.texi         |   5 +++
>  nptl/Makefile               |  12 +++---
>  nptl/tst-tls6.sh            |   6 +--
>  posix/Makefile              |  12 +++---
>  posix/globtest.sh           | 101 ++++++++++++++++++++++----------------------
>  posix/wordexp-tst.sh        |  22 +++++-----
>  rt/Makefile                 |   2 +-
>  stdio-common/Makefile       |   6 +--
>  stdio-common/tst-printf.sh  |   4 +-
>  stdio-common/tst-unbputc.sh |   4 +-
>  stdlib/Makefile             |   2 +-
>  stdlib/tst-fmtmsg.sh        |   4 +-
>  string/Makefile             |   2 +-
>  45 files changed, 281 insertions(+), 196 deletions(-)
>
> 2013-01-02  H.J. Lu  <hongjiu.lu@intel.com>
>
>         * Makeconfig (+link-pie-before-libc): New.
>         (+link-pie-after-libc): Likewise.
>         (+link-pie-tests): Likewise.
>         (+link-pie): Rewritten.
>         (link-before-libc): Remove $(config-LDFLAGS).
>         (+link): Add $(rtld-LDFLAGS) after $(+link-before-libc).
>         (+link-tests): Add $(rtld-tests-LDFLAGS) after $(+link-before-libc).
>         (config-LDFLAGS): Renamed to ...
>         (rtld-LDFLAGS): This.
>         (rtld-tests-LDFLAGS): New macro.
>         (link-libc-rpath-link): Likewise.
>         (link-libc-tests-rpath-link): Likewise.
>         (link-libc-before-gnulib): Remove -Wl,-rpath-link=$(rpath-link).
>         (link-libc): Prepand $(link-libc-rpath-link).
>         (link-libc-tests): Prepand $(link-libc-tests-rpath-link).
>         (test-program-prefix): New macro.
>         (test-via-rtld-prefix): Likewise.
>         (test-program-cmd): Likewise.
>         (host-test-program-cmd): Likewise.
>         * Makefile ($(common-objpfx)testrun.sh): Replace
>         $(run-program-prefix) with $(test-program-prefix).
>         * Makerules ($(LINK.o)): Replace $(config-LDFLAGS) with
>         $(rtld-LDFLAGS).
>         ($(common-objpfx)shlib.lds): Likewise.
>         (build-module-helper): Likewise.
>         ($(common-objpfx)format.lds): Likewise.
>         * Rules (binaries-pie-tests): New.
>         (binaries-pie-notests): Likewise.
>         (binaries-pie): Rewritten.
>         ($(addprefix $(objpfx),$(binaries-pie))): Renamed to ...
>         ($(addprefix $(objpfx),$(binaries-pie-notests))): This.
>         ($(addprefix $(objpfx),$(binaries-pie-tests))): New.
>         (make-test-out): Replace $(host-built-program-cmd) with
>         $(host-test-program-cmd).
>         * config.make.in (build-hardcoded-path-in-tests): New variable.
>         * configure.in (--enable-hardcoded-path-in-tests): New configure
>         option.
>         (hardcoded_path_in_tests): New AC_SUBST.
>         * configure: Regenerated.
>         * catgets/Makefile ($(objpfx)test-gencat.out): Replace
>         $(built-program-cmd) with $(test-program-cmd).
>         * catgets/test-gencat.sh (run_program_cmd): Renamed to ...
>         (test_program_cmd): This.
>         * elf/Makefile ($(objpfx)order.out): Run test with
>         $(test-program-prefix).
>         ($(objpfx)order2.out): Likewise.
>         ($(objpfx)tst-initorder.out): Likewise.
>         ($(objpfx)tst-initorder2.out): Likewise.
>         ($(objpfx)tst-array1.out): Replace $(built-program-cmd) with
>         $(test-program-cmd).
>         ($(objpfx)tst-array1-static.out): Likewise.
>         ($(objpfx)tst-array2.out): Likewise.
>         ($(objpfx)tst-array3.out): Likewise.
>         ($(objpfx)tst-array4.out): Likewise.
>         ($(objpfx)tst-array5.out): Likewise.
>         ($(objpfx)tst-array5-static.out): Likewise.
>         (tst-stackguard1-ARGS): Replace $(built-program-cmd) with
>         $(test-program-cmd).
>         * grp/Makefile ($(objpfx)tst_fgetgrent.out): Replace
>         $(run-program-prefix) with $(test-program-prefix).
>         * grp/tst_fgetgrent.sh (run_program_prefix): Renamed to ...
>         (test_program_prefix): This.
>         * iconvdata/Makefile ($(objpfx)tst-tables.out): Replace
>         $(run-program-prefix) with $(test-program-prefix).
>         * iconvdata/tst-table.sh (run_program_prefix): Renamed to ...
>         (test_program_prefix): This.
>         * iconvdata/tst-tables.sh: Likewise.
>         * intl/Makefile ($(objpfx)tst-gettext.out): Replace
>         $(run-program-prefix) with $(test-program-prefix).
>         ($(objpfx)tst-translit.out): Likewise.
>         ($(objpfx)tst-gettext2.out): Likewise.
>         ($(objpfx)tst-gettext4.out): Likewise.
>         ($(objpfx)tst-gettext6.out): Likewise.
>         * intl/tst-gettext.sh (run_program_prefix): Renamed to ...
>         (test_program_prefix): This.
>         * intl/tst-gettext2.sh: Likewise.
>         * intl/tst-gettext4.sh  Likewise.
>         * intl/tst-gettext6.sh: Likewise.
>         * intl/tst-translit.sh: Likewise.
>         * io/Makefile ($(objpfx)ftwtest.out): Replace $(run-program-cmd)
>         with $(test-program-cmd).
>         * libio/Makefile ($(objpfx)test-freopen.out): Replace
>         $(run-program-prefix) with $(test-program-prefix).
>         * libio/test-freopen.sh (run_program_prefix): Renamed to ...
>         (test_program_prefix): This.
>         * malloc/Makefile ($(objpfx)tst-mtrace.out): Replace
>         $(run-program-prefix) with $(test-program-prefix).
>         * malloc/tst-mtrace.sh (run_program_prefix): Renamed to ...
>         (test_program_prefix): This.
>         * manual/install.texi: Document --enable-hardcoded-path-in-tests.
>         * posix/Makefile ($(objpfx)globtest.out): Replace
>         $(run-via-rtld-prefix) and $(test-wrapper) with
>         $(test-program-prefix) and $(test-via-rtld-prefix).
>         ($(objpfx)wordexp-tst.out): Replace $(run-program-prefix) with
>         $(test-program-prefix).
>         (tst-exec-ARGS): Replace $(host-built-program-cmd) with
>         $(host-test-program-cmd).
>         (tst-spawn-ARGS): Likewise.
>         ($(objpfx)tst-rxspencer-mem): Replace $(run-program-prefix) with
>         $(test-program-prefix).
>         * posix/globtest.sh (un_via_rtld_prefix): Renamed to ...
>         (test_via_rtld_prefix): This.
>         (test_wrapper): Renamed to ...
>         (test_program_prefix): This.
>         (run_program_prefix): Replaced by test_program_prefix.
>         * posix/wordexp-tst.sh (run_program_prefix): Renamed to ...
>         (test_program_prefix): This.
>         * rt/Makefile (tst-mqueue7-ARGS): Replace $(host-built-program-cmd)
>         with $(host-test-program-cmd).
>         * stdio-common/Makefile ($(objpfx)tst-unbputc.out): Replace
>         $(run-program-prefix) with $(test-program-prefix).
>         ($(objpfx)tst-printf.out): Likewise.
>         ($(objpfx)tst-setvbuf1.out): Replace $(built-program-cmd) with
>         $(test-program-cmd).
>         * stdio-common/tst-printf.sh (run_program_prefix): Renamed to ...
>         (test_program_prefix): This.
>         * stdio-common/tst-unbputc.sh: Likewise.
>         * stdlib/Makefile ($(objpfx)tst-fmtmsg.out): Replace
>         $(run-program-prefix) with $(test-program-prefix).
>         * stdlib/tst-fmtmsg.sh (run_program_prefix): Renamed to ...
>         (test_program_prefix): This.
>         * string/Makefile ($(objpfx)tst-svc.out):  Replace
>         $(built-program-cmd) with $(test-program-cmd).
>
> localedata/
>
> 2013-01-02  H.J. Lu  <hongjiu.lu@intel.com>
>
>         * Makefile ($(objpfx)sort-test.out): Replace
>         $(run-program-prefix) with $(test-program-prefix).
>         ($(objpfx)tst-numeric.out): Likewise.
>         ($(objpfx)tst-mbswcs.out): Likewise.
>         ($(objpfx)tst-fmon.out): Add $(test-program-prefix).
>         ($(objpfx)tst-trans.out): Likewise.
>         ($(objpfx)tst-rpmatch.out): Replace $(built-program-cmd) with
>         $(test-program-cmd).
>         ($(objpfx)tst-ctype.out): Likewise.
>         ($(objpfx)tst-wctype.out): Likewise.
>         ($(objpfx)tst-langinfo.out): Likewise.
>         (bug-setlocale1-ARGS): Replace $(built-program-cmd) with
>         $(test-program-cmd).
>         * sort-test.sh (run_program_prefix): Renamed to ...
>         (test_program_prefix): This.
>         * tst-mbswcs.sh: Likewise.
>         * tst-numeric.sh: Likewise.
>         * tst-wctype.sh: Likewise.
>         * tst-fmon.sh (test_program_prefix): New. Replace
>         ${run_program_prefix} with ${test_program_prefix} when running.
>         tst-fmon.
>         * tst-trans.sh: (test_program_prefix): New.  Replace
>         ${run_program_prefix} with ${test_program_prefix} when running
>         tst-trans.
>
> nptl/
>
> 2013-01-02  H.J. Lu  <hongjiu.lu@intel.com>
>
>         * Makefile (tst-cancel7-ARGS: Replace $(host-built-program-cmd)
>         with $(host-test-program-cmd).
>         (tst-exec4-ARGS): Likewise.
>         (tst-stackguard1-ARGS): Likewise.
>         ($(objpfx)tst-tls6.out): Don't pass $(elf-objpfx) to tst-tls6.sh.
>         Replace $(rtld-installed-name) with $(test-via-rtld-prefix).
>         * tst-tls6.sh (elf_objpfx): Removed.
>         (rtld_installed_name): Renamed to ...
>         (test_via_rtld_prefix): This.
>         (tst_tls5): Prepend ${test_via_rtld_prefix}.

PING.


-- 
H.J.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]