Skip to content

Commit 97dd559

Browse files
committed
Problem: project.prefix is used for the selftest binary, not project.name
In some cases they don't match, like in malamute, so the check fails
1 parent d5062b2 commit 97dd559

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

zproject_autotools.gsl

+6-6
Original file line numberDiff line numberDiff line change
@@ -1089,8 +1089,8 @@ AM_CONDITIONAL([ENABLE_$(NAME:c)], [test x$enable_$(name:c) != xno])
10891089
AM_COND_IF([ENABLE_$(NAME:c)], [AC_MSG_NOTICE([ENABLE_$(NAME:c) defined])])
10901090

10911091
.else
1092-
AM_CONDITIONAL([ENABLE_$(PROJECT.NAME:c)_SELFTEST], [test x$enable_$(project.name:c)_selftest != xno])
1093-
AM_COND_IF([ENABLE_$(PROJECT.NAME:c)_SELFTEST], [AC_MSG_NOTICE([ENABLE_$(PROJECT.NAME:c)_SELFTEST defined])])
1092+
AM_CONDITIONAL([ENABLE_$(PROJECT.PREFIX:c)_SELFTEST], [test x$enable_$(project.prefix:c)_selftest != xno])
1093+
AM_COND_IF([ENABLE_$(PROJECT.PREFIX:c)_SELFTEST], [AC_MSG_NOTICE([ENABLE_$(PROJECT.PREFIX:c)_SELFTEST defined])])
10941094

10951095
.endfor
10961096
# Checks for library functions.
@@ -1949,7 +1949,7 @@ code:
19491949
. endif
19501950
.endfor
19511951

1952-
if ENABLE_$(PROJECT.NAME)_SELFTEST
1952+
if ENABLE_$(PROJECT.PREFIX)_SELFTEST
19531953
# Directories with test fixtures optionally provided by the project,
19541954
# and with volatile RW data possibly created by a selftest program.
19551955
# It is up to the project authors to populate the RO directory with
@@ -2141,7 +2141,7 @@ coverage: src/$(project.prefix)_selftest
21412141
\t@echo "call make clean && configure --with-gcov to enable code coverage"
21422142
\t@exit 1
21432143
endif
2144-
endif #ENABLE_$(PROJECT.NAME)_SELFTEST
2144+
endif #ENABLE_$(PROJECT.PREFIX)_SELFTEST
21452145

21462146
bindings: python-bindings
21472147

@@ -2303,12 +2303,12 @@ check-gitignore:
23032303
\t echo "SKIP: $@ (no git)"; exit 0 ; \\
23042304
\t fi )
23052305

2306-
if ENABLE_$(PROJECT.NAME)_SELFTEST
2306+
if ENABLE_$(PROJECT.PREFIX)_SELFTEST
23072307
# This calls the recipe above after building the project products and
23082308
# the selftest binary, and preparing the workspace for self-testing:
23092309
check-gitignore-all: all src/$(project.prefix)_selftest $\(top_builddir)/$\(SELFTEST_DIR_RW) $\(top_builddir)/$\(SELFTEST_DIR_RO)
23102310
\t$@\$(MAKE) check-gitignore
2311-
endif #ENABLE_$(PROJECT.NAME)_SELFTEST
2311+
endif #ENABLE_$(PROJECT.PREFIX)_SELFTEST
23122312

23132313
.insert_snippet ("Makemodule")
23142314

0 commit comments

Comments
 (0)