OpenAFS Master Repository branch, openafs-stable-1_8_x, updated. openafs-stable-1_8_13_2-8-g6e2b61d

Gerrit Code Review gerrit@openafs.org
Thu, 6 Mar 2025 12:30:05 -0500


The following commit has been merged in the openafs-stable-1_8_x branch:
commit cd6331800578ae6d34c56964bd55fdb1a5149cd4
Author: Andrew Deason <adeason@sinenomine.net>
Date:   Wed Jan 15 11:23:00 2025 -0700

    tests: Fix most tests for objdir builds
    
    Fix a few miscellaneous issues with building and running our tests in
    objdir builds:
    
    - Our C tests use -I$(srcdir)/../.. in the CFLAGS, so we can #include
      <tests/tap/basic.h>. However, basic.h actually gets copied from
      src/external/c-tap-harness/tests/tap/ to tests/tap/ during the
      build, and so basic.h is available in the objdir, not srcdir. For
      objdir builds, this causes building the tests to fail with failing
      to find basic.h. Fix this to use TOP_OBJDIR as the include path
      instead.
    
    - Our 'make check' in tests/ tries to run ./libwrap; but our cwd will
      be in the objdir for objdir builds, and libwrap is a script in our
      srcdir. Fix this to run libwrap from the srcdir path.
    
    - In tests/opr/softsig-t, it tries to find the 'softsig-helper' binary
      in the same dir as 'softsig-t'. However, softsig-t is just a script
      in the srcdir, but softsig-helper is a binary built in the objdir.
      Fix this to use the BUILD env var provided by the tests wrapper, by
      default.
    
    Reviewed-on: https://gerrit.openafs.org/13939
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
    (cherry picked from commit f4ab3767b7e65028b93e731da6f09ee385c51daf)
    
    [cwills@sinenomine.net] - A change is required in tests/opr/softsig-t
    
    The change is required due to different order of commits.  In master the
    commit:
        "tests: Fix most tests for objdir builds" (f4ab3767b7e65)
    is applied before
        "tests: Accommodate c-tap-harness 4.7" (624219a1b2192).
    In 1.8.x the commit:
        "tests: Accommodate c-tap-harness 4.7" (0453c15b2a2cb)
    is already present.
    
    Change-Id: Ide0d2028ec936f047e6cda5e29257cb0d263fde8
    Reviewed-on: https://gerrit.openafs.org/16091
    Reviewed-by: Andrew Deason <adeason@sinenomine.net>
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
    Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

 tests/Makefile.in        |  2 +-
 tests/auth/Makefile.in   |  2 +-
 tests/cmd/Makefile.in    |  2 +-
 tests/common/Makefile.in |  2 +-
 tests/opr/Makefile.in    |  2 +-
 tests/opr/softsig-t      | 12 +++++++++++-
 tests/rx/Makefile.in     |  2 +-
 tests/util/Makefile.in   |  2 +-
 tests/volser/Makefile.in |  2 +-
 9 files changed, 19 insertions(+), 9 deletions(-)

-- 
OpenAFS Master Repository