X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dep-tests.sh;h=0a19c2397c0b1e92f60e95fc53b80ec328e17e1a;hb=c23d3d12a3cc2fd8bac9d62c865d7bc2c72fcb25;hp=206416d864202ae8024a8419b4fc7817faf1b37b;hpb=03e8eb3d5b1fe6a098d1df65bc9b3b3ca49e4a66;p=packages%2Fphp.git

diff --git a/dep-tests.sh b/dep-tests.sh
index 206416d..0a19c23 100644
--- a/dep-tests.sh
+++ b/dep-tests.sh
@@ -1,20 +1,27 @@
 #!/bin/sh
 # inter-dependencies checker.
 
-# spl must be loaded before simplexml, therefore spl has itself before its deps
-dep_spl="pcre spl simplexml"
+with_mysqlnd=mysqlnd
+
+dep_spl="pcre simplexml"
+dep_session="spl $dep_spl"
 dep_filter='pcre'
 dep_eaccelerator='session'
-dep_mysqli="$dep_spl"
-dep_pdo="$dep_spl"
+dep_mysql="$with_mysqlnd"
+dep_mysqli="$dep_spl spl $with_mysqlnd"
+dep_pdo="$dep_spl spl"
 dep_pdo_sqlite="$dep_pdo pdo"
 dep_pdo_pgsql="$dep_pdo pdo"
+dep_pdo_oci="$dep_pdo pdo"
 dep_pdo_odbc="$dep_pdo pdo"
 dep_pdo_firebird="$dep_pdo pdo"
 dep_pdo_dblib="$dep_pdo pdo"
-dep_pdo_mysql="$dep_pdo pdo"
-dep_simplexml="$dep_spl"
+dep_pdo_mysql="$dep_pdo pdo $with_mysqlnd"
+dep_simplexml="$dep_spl spl"
+dep_imap="pcre"
+dep_phar="$dep_spl spl"
 dep_sqlite="$dep_pdo pdo"
+dep_fileinfo="pcre"
 dep_wddx='xml'
 dep_xmlreader='dom'
 dep_xmlrpc='xml'
@@ -22,17 +29,29 @@ dep_xsl='dom'
 
 php=${PHP:-$(php-config --php-binary)}
 ext_dir=${EXTENSION_DIR:-$(php-config --extension-dir)}
-conf_dir=${CONFIG_DIR:-$(php-config --sysconfdir)/conf.d}
+conf_dir=${CONFIG_DIR:-$(php-config --sysconfdir)/conf.d $(php-config --sysconfdir)/cli.d}
+tmpini=$(mktemp)
 
 # poldek --sn ac-ready -u php-*
 for ext in $ext_dir/*.so; do
 	[ -f $ext ] || continue
 	ext=${ext##*/}; ext=${ext%.so}
+
 	deps=$(eval echo \$dep_$ext)
 	# add ext itself, if already not in list (spl case)
-	[[ $deps = *$ext* ]] || deps="$deps $ext"
+	[[ $deps = *\ $ext\ * ]] || deps="$deps $ext"
 
-	args=$(for e in $deps; do echo -d extension=$e.so; done)
 	echo -n "$ext (deps: ${deps# })..."
-	$php -n -d extension_dir=$ext_dir $args -r "exit(extension_loaded('${ext}') ? 0 : 1);" && echo OK || echo FAIL
+
+	grep -rlE '^extension=('$(echo "${deps# }" | tr ' ' '|')').so$' $conf_dir | LC_CTYPE=C LC_ALL= sort | xargs cat > $tmpini
+	$php -n -d extension_dir=$ext_dir -c $tmpini -r "exit(extension_loaded('${ext}') ? 0 : 1);"
+	rc=$?
+	if [ $rc = 0 ]; then
+		echo OK
+	else
+		echo FAIL
+		echo "Failed config was:"
+		cat $tmpini
+	fi
 done
+rm -f $t