Mercurial > hg > vamp-build-and-test
changeset 39:12d422dd6992
Merge
| author | Chris Cannam |
|---|---|
| date | Wed, 06 Aug 2014 17:44:04 +0100 |
| parents | 25a9332971f7 (current diff) 5ae8d8a1e411 (diff) |
| children | a7005ff33d3c |
| files | .hgsubstate SCRIPTS/process.sh |
| diffstat | 2 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Wed Aug 06 17:43:06 2014 +0100 +++ b/.hgsubstate Wed Aug 06 17:44:04 2014 +0100 @@ -9,7 +9,7 @@ b835875739968beb870e7e09132aa361656a8a30 vamp-aubio-plugins 81146373f024be1c82371f04262cf2ae1680cb61 vamp-libxtract-plugins 8bc4ec815b6b695371dc9dda500191892ca5d2a7 vamp-onsetsds-plugin -12ee4e664b35adc714f186ba6fa19699a5dbfcd1 vamp-plugin-sdk -925c8dedde9cc14e9f3eaec60ae3cfa373fe92a9 vamp-plugin-tester +7284eef3c4efe4ae9829709c09d8809eba954ca1 vamp-plugin-sdk +929b95cd25b1f421d0495487ed65fc40e2d37cbc vamp-plugin-tester bc66d4d9c8f204fdb844aee96668aebbd78809bb vamp-test-plugin 0df94e3f0fdb6eac02860655503e242a86cbb671 vampy
--- a/SCRIPTS/process.sh Wed Aug 06 17:43:06 2014 +0100 +++ b/SCRIPTS/process.sh Wed Aug 06 17:44:04 2014 +0100 @@ -52,6 +52,7 @@ hostext= valgrind=valgrind archflags= + identpattern='ELF 32.*Linux' ;; linux64) platform=linux @@ -62,6 +63,7 @@ hostext= valgrind=valgrind archflags= + identpattern='ELF 64.*Linux' ;; mingw32) platform=mingw @@ -72,6 +74,7 @@ hostext=.exe valgrind= archflags= + identpattern='PE32.*386.*Windows' ;; mingw64) platform=mingw @@ -82,6 +85,7 @@ hostext=.exe valgrind= archflags= + identpattern='not known yet' ##!!! ;; osx32) platform=osx @@ -92,6 +96,7 @@ hostext= valgrind= archflags="-arch i386" + identpattern='not known yet' ##!!! ;; osx64) platform=osx @@ -103,6 +108,7 @@ valgrind= # This is a difficult choice for various reasons... have to ponder archflags="-mmacosx-version-min=10.6 -arch x86_64 -arch i386" + identpattern='not known yet' ##!!! ;; esac; @@ -234,7 +240,13 @@ dir="$1" for x in "$dir/"*"$pluginext"; do if [ -f "$x" ]; then - return 0 + if file "$x" | grep -q "$identpattern" ; then + return 0 + else + echo "Plugin $x exists, but fails to match file type for correct platform" + echo "(file type is: `file $x`)" + return 1 + fi fi done return 1 @@ -351,7 +363,7 @@ run_tester "$dir" run_environmental_tests "$dir" else - echo "Build apparently succeeded, but no resulting plugin(s) found" | tee -a "$reportdir/$dir.build.txt" + echo "Build apparently succeeded, but no resulting plugin(s) found, or plugin(s) have wrong file type or platform" | tee -a "$reportdir/$dir.build.txt" echo "$dir" >> "$notbuilt" fi else