Skip to content

Commit

Permalink
Fix --with-sanitizer support.
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelrsweet committed Jul 25, 2023
1 parent e2d556f commit e1ea35a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches: [ master ]
pull_request:
branches: [ master ]
workflow_dispatch:

jobs:
build-linux-static-openssl:
Expand Down
4 changes: 3 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -4197,9 +4197,11 @@ fi
if test ${with_sanitizer+y}
then :
withval=$with_sanitizer;
else $as_nop
with_sanitizer=no
fi
if test "x$with_sanitizer" = x
if test "x$with_sanitizer" = xyes
then :
with_sanitizer="address"
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ AS_IF([test x$enable_libpam != xno], [
dnl Extra compiler options...
AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [turn on debugging, default=no]))
AC_ARG_ENABLE([maintainer], AS_HELP_STRING([--enable-maintainer], [turn on maintainer mode, default=no]))
AC_ARG_WITH([sanitizer], AS_HELP_STRING([--with-sanitizer], [build with address, leak, memory, thread, or undefined sanitizer, default=no]))
AS_IF([test "x$with_sanitizer" = x], [
AC_ARG_WITH([sanitizer], AS_HELP_STRING([--with-sanitizer], [build with address, leak, memory, thread, or undefined sanitizer, default=no]), [], [with_sanitizer=no])
AS_IF([test "x$with_sanitizer" = xyes], [
with_sanitizer="address"
], [test "$with_sanitizer" != address -a "$with_sanitizer" != leak -a "$with_sanitizer" != memory -a "$with_sanitizer" != no -a "$with_sanitizer" != thread -a "$with_sanitizer" != undefined], [
AC_MSG_ERROR([Unsupported --with-sanitizer value "$with_sanitizer" specified.])
Expand Down
8 changes: 6 additions & 2 deletions test/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,23 @@
#
# Integration test script for ippsample.
#
# Copyright © 2018-2022 by The Printer Working Group.
# Copyright © 2018-2023 by The Printer Working Group.
#
# Licensed under Apache License v2.0. See the file "LICENSE" for more
# information.
#
# Usage:
#
# ./run-tests.sh
# test/run-tests.sh
#
# Set IPPEVEPRINTERPORT and IPPSERVERPORT environment variable to override the
# default 8xxx and 9xxx port numbers.
status=0

# Support running with shared libraries as necessary on macOS and Linux...
DYLD_LIBRARY_PATH="$(pwd)/libcups/cups"; export DYLD_LIBRARY_PATH
LD_LIBRARY_PATH="$(pwd)/libcups/cups"; export LD_LIBRARY_PATH

# Determine port numbers to use for tests...
ippeveprinterport=${IPPEVEPRINTERPORT:=$((8000 + ( $(id -u) % 1000 ) ))}
ippserverport=${IPPSERVERPORT:=$((9000 + ( $(id -u) % 1000 ) ))}
Expand Down

0 comments on commit e1ea35a

Please sign in to comment.