From 18bdab92f72ada900e615aab9a65113ddd8e04a8 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Mon, 23 Mar 2020 21:09:19 +0000 Subject: [PATCH] use correct lib extensions in the tests --- plugins/meson.build | 6 +++--- scripts/lv2_validate_wrap.sh | 9 +++++---- scripts/lv2lint_wrap.sh | 7 ++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/plugins/meson.build b/plugins/meson.build index e7aa5e4..4cb8f7a 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -259,7 +259,7 @@ if get_option ('plugins').contains (pl[0]) 'LV2 lint', lv2lint_wrap, args: [ lv2lint.path(), pl_build_dir, pl_str, - pl_uri, + pl_uri, libext, ], suite: pl[0]) endif @@ -269,8 +269,8 @@ if get_option ('plugins').contains (pl[0]) test ( 'LV2 validate', lv2_validate_wrap, args: [ - lv2lint.path(), pl_build_dir, pl_str, - pl_uri, + lv2_validate.path(), pl_build_dir, pl_str, + pl_uri, libext, ], suite: pl[0]) endif diff --git a/scripts/lv2_validate_wrap.sh b/scripts/lv2_validate_wrap.sh index 0437150..1a82c93 100755 --- a/scripts/lv2_validate_wrap.sh +++ b/scripts/lv2_validate_wrap.sh @@ -11,14 +11,15 @@ LV2_VALIDATE_BIN=$1 PL_BUILD_DIR=$2 PL_NAME=$3 PL_URI=$4 +LIBEXT=$5 -tmpdir=$(mktemp -d /tmp/lv2lint_wrap.XXXXXXXXX) +tmpdir=$(mktemp -d /tmp/lv2_validate_wrap.XXXXXXXXX) tmp_plugin_dir="$tmpdir/$PL_NAME" mkdir -p "$tmp_plugin_dir" cp $PL_BUILD_DIR/$PL_NAME.ttl \ - $PL_BUILD_DIR/${PL_NAME}_dsp.so $tmp_plugin_dir/ -if [ -e $PL_BUILD_DIR/${PL_NAME}_ui.so ] ; then - cp $PL_BUILD_DIR/${PL_NAME}_ui.so $tmp_plugin_dir/ + $PL_BUILD_DIR/${PL_NAME}_dsp$LIBEXT $tmp_plugin_dir/ +if [ -e $PL_BUILD_DIR/${PL_NAME}_ui$LIBEXT ] ; then + cp $PL_BUILD_DIR/${PL_NAME}_ui$LIBEXT $tmp_plugin_dir/ fi cp $PL_BUILD_DIR/$3_manifest.ttl $tmp_plugin_dir/manifest.ttl diff --git a/scripts/lv2lint_wrap.sh b/scripts/lv2lint_wrap.sh index ec9d844..a2a4134 100755 --- a/scripts/lv2lint_wrap.sh +++ b/scripts/lv2lint_wrap.sh @@ -11,14 +11,15 @@ LV2_LINT_BIN=$1 PL_BUILD_DIR=$2 PL_NAME=$3 PL_URI=$4 +LIBEXT=$5 tmpdir=$(mktemp -d /tmp/lv2lint_wrap.XXXXXXXXX) tmp_plugin_dir="$tmpdir/$PL_NAME" mkdir -p "$tmp_plugin_dir" cp $PL_BUILD_DIR/$PL_NAME.ttl \ - $PL_BUILD_DIR/${PL_NAME}_dsp.so $tmp_plugin_dir/ -if [ -e $PL_BUILD_DIR/${PL_NAME}_ui.so ] ; then - cp $PL_BUILD_DIR/${PL_NAME}_ui.so $tmp_plugin_dir/ + $PL_BUILD_DIR/${PL_NAME}_dsp$LIBEXT $tmp_plugin_dir/ +if [ -e $PL_BUILD_DIR/${PL_NAME}_ui$LIBEXT ] ; then + cp $PL_BUILD_DIR/${PL_NAME}_ui$LIBEXT $tmp_plugin_dir/ fi cp $PL_BUILD_DIR/$3_manifest.ttl $tmp_plugin_dir/manifest.ttl