From 16066ae43222abffe9c14cb0c0b1234004f0834d364874f42e0d1af71b870989 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 25 Jan 2016 15:49:27 +0000
Subject: [PATCH] Accepting request 355774 from home:pgajdos

- version 20161120
- %apache_test_module_start_apache: detect if module is built in
  statically before attempt to search for it in filesystem

OBS-URL: https://build.opensuse.org/request/show/355774
OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros?expand=0&rev=29
---
 apache-rpm-macros.changes | 7 +++++++
 apache-rpm-macros.spec    | 2 +-
 macros.apache-module-test | 6 ++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apache-rpm-macros.changes b/apache-rpm-macros.changes
index e11998e..db4eeb1 100644
--- a/apache-rpm-macros.changes
+++ b/apache-rpm-macros.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 20 18:33:51 UTC 2016 - pgajdos@suse.com
+
+- version 20161120
+- %apache_test_module_start_apache: detect if module is built in
+  statically before attempt to search for it in filesystem
+
 -------------------------------------------------------------------
 Mon Jan 11 15:21:58 UTC 2016 - pgajdos@suse.com
 
diff --git a/apache-rpm-macros.spec b/apache-rpm-macros.spec
index 96bcea1..04fdf3d 100644
--- a/apache-rpm-macros.spec
+++ b/apache-rpm-macros.spec
@@ -59,7 +59,7 @@
 %endif
 %define macros_file           macros.apache
 Name:           apache-rpm-macros
-Version:        20160111
+Version:        20160120
 Release:        0
 Summary:        Apache RPM Macros
 License:        Apache-2.0
diff --git a/macros.apache-module-test b/macros.apache-module-test
index 87ed411..eed16f3 100644
--- a/macros.apache-module-test
+++ b/macros.apache-module-test
@@ -70,7 +70,8 @@
   if [ -z "$TEST_MPM" ]; then \
     TEST_MPM='%{__test_mpm}' \
   fi \
-  # helpers \
+  # apache binary \
+  CMD=$(ls %{_sbindir}/httpd*-$TEST_MPM | head -n 1) \
   # begin \
   echo "-----------------------------------------------------------" \
   echo "APACHE MODULE TEST" \
@@ -97,6 +98,8 @@
   fi \
   echo "LoadModule authz_host_module $SYSTEM_MODULE_PATH/mod_authz_host.so"    >> $TEST_CONF_FILE \
   for m in $(echo $MODULES | tr ':' ' '); do \
+    # if module is compiled in statically, do not load \
+    $CMD -f $TEST_CONF_FILE -M | grep $m && continue \
     module_path=$(find %{buildroot} %{apache_libexecdir}-$TEST_MPM %{apache_libexecdir} -name "mod_$m.so" | tail -n 1) \
     if [ -z "$module_path" ]; then \
       echo "ERROR: Module $m not found." \
@@ -124,7 +127,6 @@
   echo "DocumentRoot $DOCUMENT_ROOT"                                           >> $TEST_CONF_FILE \
   echo "DirectoryIndex index.html"                                             >> $TEST_CONF_FILE \
   # run apache \
-  CMD=$(ls %{_sbindir}/httpd*-$TEST_MPM | head -n 1) \
   echo -n "Starting Apache ... " \
   $CMD -f $TEST_CONF_FILE -k start \
   # wait to be sure apache finished start \