# HG changeset patch
# User Chris Cannam
# Date 1407255638 -3600
# Node ID 14ff78c4fa42f45cc20b5b37cd166bc016c50296
# Parent  e1b89e300e7660058f670c63321740ac9d3fdcc5# Parent  fb1f7489a5dcdba625eea56bcd9bc6ed44d12f4d
Merge

diff -r e1b89e300e76 -r 14ff78c4fa42 .hgsubstate
--- a/.hgsubstate	Tue Aug 05 17:19:56 2014 +0100
+++ b/.hgsubstate	Tue Aug 05 17:20:38 2014 +0100
@@ -3,7 +3,7 @@
 ca32a96c123a2c3f7548e37a8d5f4205632bdd9d mazurka-plugins
 90c2f0b597f8130c906ff3ea019480bc433d7db2 nnls-chroma
 3b37e7be34dad2fc12afced53ade57038e8ae336 pyin
-c9aad4a5a444387b798014c7e1e7bc4951d99530 qm-vamp-plugins
+d30d68f410b65da8b5e9303e3e2c0a6245500d88 qm-vamp-plugins
 4cc12d2d64e47b72122320f5e165b0b534811f24 segmenter-vamp-plugin
 4e19c60241cbb6594dcfb5b83de6f6fdd24405b7 silvet
 b835875739968beb870e7e09132aa361656a8a30 vamp-aubio-plugins
diff -r e1b89e300e76 -r 14ff78c4fa42 SCRIPTS/process.sh
--- a/SCRIPTS/process.sh	Tue Aug 05 17:19:56 2014 +0100
+++ b/SCRIPTS/process.sh	Tue Aug 05 17:20:38 2014 +0100
@@ -228,6 +228,7 @@
     if [ -z "$ids" ]; then
 	echo 
 	echo "No plugins reported to test in $dir"
+	echo "$dir" >> "$testfailed"
 	return 1
     else
 	for id in $ids; do
@@ -251,7 +252,12 @@
 
 public_symbols() {
     lib="$1"
-    "$toolprefix"nm -g --defined-only "$lib" | awk '{ print $3; }'
+    # nm -g prints global symbols in both OS/X and GNU tools, but
+    # printing only global *defined* symbols is harder. In GNU it is
+    # nm -g --defined-only; the OS/X docs suggest nm -gu should work,
+    # but it doesn't. What I think will work with both is simply
+    # grepping out the undefineds:
+    "$toolprefix"nm -g "$lib" | grep -v ' U ' | awk '{ print $3; }'
 }
 
 run_environmental_tests() {