Skip to content
This repository was archived by the owner on Feb 28, 2023. It is now read-only.

Commit 9d88019

Browse files
ilg-ulilg-ul
committed
common-apps: use TEST_BIN_PATH
1 parent 7ce11cc commit 9d88019

File tree

1 file changed

+77
-52
lines changed

1 file changed

+77
-52
lines changed

‎scripts/common-apps-functions-source.sh‎

Lines changed: 77 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -193,30 +193,38 @@ function build_binutils()
193193
function test_binutils()
194194
{
195195
(
196-
xbb_activate_installed_bin
197-
198-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-ar"
199-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-as"
200-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-ld"
201-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-nm"
202-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-objcopy"
203-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-objdump"
204-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-ranlib"
205-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-size"
206-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-strings"
207-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-strip"
208-
209-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-ar" --version
210-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-as" --version
211-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-ld" --version
212-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-nm" --version
213-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-objcopy" --version
214-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-objdump" --version
215-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-ranlib" --version
216-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-size" --version
217-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-strings" --version
218-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-strip" --version
196+
if [ -d "xpacks/.bin" ]
197+
then
198+
TEST_BIN_PATH="$(pwd)/xpacks/.bin"
199+
elif [ -d "${APP_PREFIX}/bin" ]
200+
then
201+
TEST_BIN_PATH="${APP_PREFIX}/bin"
202+
else
203+
echo "Wrong folder."
204+
exit 1
205+
fi
219206

207+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-ar"
208+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-as"
209+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-ld"
210+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-nm"
211+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-objcopy"
212+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-objdump"
213+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-ranlib"
214+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-size"
215+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-strings"
216+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-strip"
217+
218+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-ar" --version
219+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-as" --version
220+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-ld" --version
221+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-nm" --version
222+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-objcopy" --version
223+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-objdump" --version
224+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-ranlib" --version
225+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-size" --version
226+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-strings" --version
227+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-strip" --version
220228
)
221229
}
222230

@@ -1035,22 +1043,31 @@ function build_gcc_final()
10351043
function test_gcc()
10361044
{
10371045
(
1038-
xbb_activate_installed_bin
1039-
1040-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-gcc"
1041-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-g++"
1042-
show_libs "${APP_PREFIX}/libexec/gcc/${GCC_TARGET}/${GCC_VERSION}/cc1"
1043-
show_libs "${APP_PREFIX}/libexec/gcc/${GCC_TARGET}/${GCC_VERSION}/cc1plus"
1044-
show_libs "${APP_PREFIX}/libexec/gcc/${GCC_TARGET}/${GCC_VERSION}/collect2"
1045-
show_libs "${APP_PREFIX}/libexec/gcc/${GCC_TARGET}/${GCC_VERSION}/lto-wrapper"
1046-
show_libs "${APP_PREFIX}/libexec/gcc/${GCC_TARGET}/${GCC_VERSION}/lto1"
1047-
1048-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gcc" --help
1049-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gcc" -dumpversion
1050-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gcc" -dumpmachine
1051-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gcc" -print-multi-lib
1052-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gcc" -print-multi-lib | wc -l | sed -e 's| ||g'
1053-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gcc" -dumpspecs
1046+
if [ -d "xpacks/.bin" ]
1047+
then
1048+
TEST_BIN_PATH="$(pwd)/xpacks/.bin"
1049+
elif [ -d "${APP_PREFIX}/bin" ]
1050+
then
1051+
TEST_BIN_PATH="${APP_PREFIX}/bin"
1052+
else
1053+
echo "Wrong folder."
1054+
exit 1
1055+
fi
1056+
1057+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-gcc"
1058+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-g++"
1059+
show_libs "$(${TEST_BIN_PATH}/${GCC_TARGET}-gcc -print-prog-name=cc1)"
1060+
show_libs "$(${TEST_BIN_PATH}/${GCC_TARGET}-gcc -print-prog-name=cc1plus)"
1061+
show_libs "$(${TEST_BIN_PATH}/${GCC_TARGET}-gcc -print-prog-name=collect2)"
1062+
show_libs "$(${TEST_BIN_PATH}/${GCC_TARGET}-gcc -print-prog-name=lto-wrapper)"
1063+
show_libs "$(${TEST_BIN_PATH}/${GCC_TARGET}-gcc -print-prog-name=lto1)"
1064+
1065+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gcc" --help
1066+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gcc" -dumpversion
1067+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gcc" -dumpmachine
1068+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gcc" -print-multi-lib
1069+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gcc" -print-multi-lib | wc -l | sed -e 's| ||g'
1070+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gcc" -dumpspecs
10541071

10551072
local tmp=$(mktemp /tmp/gcc-test.XXXXX)
10561073
rm -rf "${tmp}"
@@ -1068,10 +1085,10 @@ main(int argc, char* argv[])
10681085
printf("Hello World\n");
10691086
}
10701087
__EOF__
1071-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gcc" -o hello-c.elf -specs=nosys.specs hello.c
1088+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gcc" -o hello-c.elf -specs=nosys.specs hello.c
10721089

1073-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gcc" -o hello.c.o -c -flto hello.c
1074-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gcc" -o hello-c-lto.elf -specs=nosys.specs -flto -v hello.c.o
1090+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gcc" -o hello.c.o -c -flto hello.c
1091+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gcc" -o hello-c-lto.elf -specs=nosys.specs -flto -v hello.c.o
10751092

10761093
# Note: __EOF__ is quoted to prevent substitutions here.
10771094
cat <<'__EOF__' > hello.cpp
@@ -1090,10 +1107,10 @@ __sync_synchronize()
10901107
{
10911108
}
10921109
__EOF__
1093-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-g++" -o hello-cpp.elf -specs=nosys.specs hello.cpp
1110+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-g++" -o hello-cpp.elf -specs=nosys.specs hello.cpp
10941111

1095-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-g++" -o hello.cpp.o -c -flto hello.cpp
1096-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-g++" -o hello-cpp-lto.elf -specs=nosys.specs -flto -v hello.cpp.o
1112+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-g++" -o hello.cpp.o -c -flto hello.cpp
1113+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-g++" -o hello-cpp-lto.elf -specs=nosys.specs -flto -v hello.cpp.o
10971114

10981115
cd ..
10991116
rm -rf "${tmp}"
@@ -1351,16 +1368,24 @@ function test_gdb()
13511368
fi
13521369

13531370
(
1354-
# Required by gdb-py to access the python shared library.
1355-
xbb_activate_installed_bin
1371+
if [ -d "xpacks/.bin" ]
1372+
then
1373+
TEST_BIN_PATH="$(pwd)/xpacks/.bin"
1374+
elif [ -d "${APP_PREFIX}/bin" ]
1375+
then
1376+
TEST_BIN_PATH="${APP_PREFIX}/bin"
1377+
else
1378+
echo "Wrong folder."
1379+
exit 1
1380+
fi
13561381

1357-
show_libs "${APP_PREFIX}/bin/${GCC_TARGET}-gdb${suffix}"
1382+
show_libs "${TEST_BIN_PATH}/${GCC_TARGET}-gdb${suffix}"
13581383

1359-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gdb${suffix}" --version
1360-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gdb${suffix}" --config
1384+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gdb${suffix}" --version
1385+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gdb${suffix}" --config
13611386

13621387
# This command is known to fail with 'Abort trap: 6' (SIGABRT)
1363-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gdb${suffix}" \
1388+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gdb${suffix}" \
13641389
--nh \
13651390
--nx \
13661391
-ex='show language' \
@@ -1371,7 +1396,7 @@ function test_gdb()
13711396
if [ "${suffix}" == "-py3" ]
13721397
then
13731398
# Show Python paths.
1374-
run_app "${APP_PREFIX}/bin/${GCC_TARGET}-gdb${suffix}" \
1399+
run_app "${TEST_BIN_PATH}/${GCC_TARGET}-gdb${suffix}" \
13751400
--nh \
13761401
--nx \
13771402
-ex='set pagination off' \

0 commit comments

Comments
 (0)