Don't build/install/use bundled gctp code/headers. * cproj.h, proj.h: part of GCTP, therefore already present. * HE5_config.h, tutils.h: used for library building and testing. diff --git a/Makefile.in b/Makefile.in index f160d0d..367b537 100644 --- a/Makefile.in +++ b/Makefile.in @@ -206,7 +206,7 @@ LIBGCTP = $(top_builddir)/gctp/src/libGctp.la @TESTDRIVERS_CONDITIONAL_TRUE@TESTDRIVERS = testdrivers @INSTALL_INCLUDE_CONDITIONAL_FALSE@INCLUDE = @INSTALL_INCLUDE_CONDITIONAL_TRUE@INCLUDE = include -SUBDIRS = gctp src $(INCLUDE) samples $(TESTDRIVERS) +SUBDIRS = src $(INCLUDE) samples $(TESTDRIVERS) all: all-recursive .SUFFIXES: diff --git a/samples/Makefile.in b/samples/Makefile.in index 59331dd..64fda89 100644 --- a/samples/Makefile.in +++ b/samples/Makefile.in @@ -206,7 +206,6 @@ he5_gd_datainfo_SOURCES = he5_gd_datainfo.c he5_gd_datainfo_OBJECTS = he5_gd_datainfo.$(OBJEXT) he5_gd_datainfo_LDADD = $(LDADD) am__DEPENDENCIES_1 = $(top_builddir)/src/libhe5_hdfeos.la -am__DEPENDENCIES_2 = $(top_builddir)/gctp/src/libGctp.la he5_gd_datainfo_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) he5_gd_defexternalfld_SOURCES = he5_gd_defexternalfld.c @@ -1093,7 +1092,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ LIBHDFEOS5 = $(top_builddir)/src/libhe5_hdfeos.la -LIBGCTP = $(top_builddir)/gctp/src/libGctp.la +LIBGCTP = # Boilerplate definitions file diff --git a/include/Makefile.in b/include/Makefile.in index a572128..64dabb5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -190,8 +190,7 @@ LIBGCTP = $(top_builddir)/gctp/src/libGctp.la # Boilerplate include # Headers to install -include_HEADERS = HE5_GctpFunc.h HE5_HdfEosDef.h HE5_config.h cproj.h ease.h \ - isin.h proj.h tutils.h cfortHdf.h +include_HEADERS = HE5_GctpFunc.h HE5_HdfEosDef.h ease.h isin.h cfortHdf.h all: HE5_config.h $(MAKE) $(AM_MAKEFLAGS) all-am -- 2.10.0 '/>
path: root/tests/guix-package-net.sh
AgeCommit message (Expand)Author
2023-04-21tests: Fix checks for expected failures....Addresses <https://issues.guix.gnu.org/62406>. With 'set -e', a return status inverted with '!' does not cause the shell to exit immediately. Instead use '&& false' to indicate an expected failure. * tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment-container.sh, tests/guix-environment.sh, tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh, tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh, tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh, tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh, tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with '... && false' or `test ! ...` as appropriate. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Eric Bavier
2022-01-19package: Honor '--dry-run' when target profile is already in store....Fixes <https://issues.guix.gnu.org/53267>. Reported by Tirifto <tirifto@posteo.cz>. Regression introduced in 65ffb9388c1c3d870cb07e4cb3ef12c9ac06a161. In the (unlikely) case where the profile we're targeting with "guix upgrade -n" or similar is already built, a new profile generation would be created and linked to despite the use of '-n'. This is because 65ffb9388c1c3d870cb07e4cb3ef12c9ac06a161 assumed that dry-run behavior would be handled solely by the build handler, which is not the case when there's nothing to build. * guix/scripts/package.scm (build-and-use-profile): Reintroduce #:dry-run? and honor it. (process-actions): Pass #:dry-run? to 'build-and-use-profile'. * tests/guix-package-net.sh: Add test. Ludovic Courtès
2022-01-16tests: Clean up after 'tests/guix-package-net.sh'....* tests/guix-package-net.sh: Remove second 'trap' line. Change first 'trap' line to remove "$module_dir" and *.lock files. Ludovic Courtès