Commit 3e5e8622 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

correction in trap()

parent e3a77157

scripts/prepare_instrumentation.sh

+3 −2
Original line number Diff line number Diff line
@@ -226,9 +226,9 @@ shopt -u extglob 
find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(unsigned long\)\1\)/" \{\} \;



# run wmc_tool, exit if the command fails

>wmc_tool_output.txt

trap 'cat wmc_tool_output.txt; trap - EXIT' ERR EXIT

set -e

>wmc_tool_output.txt

trap 'echo "Error calling WMC tool: $?"; cat wmc_tool_output.txt' ERR

"$scriptdir/tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/asdfdencoder.c" "$targetdir/lib_asdfenc/*.c" "$targetdir/lib_asdfcom/*.c" >>wmc_tool_output.txt 2>&1

"$scriptdir/tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/encoder.c" "$targetdir/lib_enc/*.c" "$targetdir/lib_com/*.c" >>wmc_tool_output.txt 2>&1

"$scriptdir/tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" >>wmc_tool_output.txt 2>&1
@@ -244,6 +244,7 @@ else 
    # ISAR post rend

    "$scriptdir/tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$lc3plus_fftdir" >>wmc_tool_output.txt 2>&1

fi

trap - ERR

set +e



# automatically enable #define WMOPS in options.h