From c01f8f66b5225a1151afe579aefae79876b93f4f Mon Sep 17 00:00:00 2001 From: Keith Valin Date: Tue, 3 Feb 2026 13:29:31 -0500 Subject: [PATCH 1/3] fix: Ensure that test_tools are in the proper location Ensure that test_tools are downloaded to $HOME/test_tools. --- coremark/coremark_run | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/coremark/coremark_run b/coremark/coremark_run index 0216f69..57477c5 100755 --- a/coremark/coremark_run +++ b/coremark/coremark_run @@ -77,7 +77,7 @@ usage() echo " --commit : git commit to use, default is the tag ${coremark_version}" echo " --cpu_add : starting at cpu count of 1, add this number of cpus to each run" echo " --powers_2s: starting at 1, run the number of cpus by powers of 2's" - source $curdir/test_tools/general_setup --usage + source $HOME/test_tools/general_setup --usage exit 0 } @@ -111,8 +111,8 @@ install_test_tools() # Check to see if the test tools directory exists. If it does, we do not need to # clone the repo. # - if [ ! -d "$curdir/test_tools" ]; then - git clone $tools_git $curdir/test_tools + if [ ! -d "$HOME/test_tools" ]; then + git clone $tools_git $HOME/test_tools if [ $? -ne 0 ]; then exit_out "pulling git $tools_git failed." 1 fi @@ -129,7 +129,7 @@ execute_coremark() # # Ubuntu breaking without this setting. # - if [[ "`$curdir/test_tools/detect_os`" == "ubuntu" ]]; then + if [[ "`$TOOLS_BIN/detect_os`" == "ubuntu" ]]; then declare -x PORT_DIR="linux64" fi make_flags="-DMULTITHREAD=${2} -DUSE_PTHREAD -pthread" @@ -287,7 +287,7 @@ generate_results() else echo Ran > test_results_report fi - ${curdir}/test_tools/save_results --curdir $curdir --home_root $to_home_root --other_files "*_summary,run*log,test_results_report,${pcpdir}" --results $results_file --test_name coremark --tuned_setting=$to_tuned_setting --version $coremark_version --user $to_user + ${TOOLS_BIN}/save_results --curdir $curdir --home_root $to_home_root --other_files "*_summary,run*log,test_results_report,${pcpdir}" --results $results_file --test_name coremark --tuned_setting=$to_tuned_setting --version $coremark_version --user $to_user popd > /dev/null } @@ -309,10 +309,10 @@ install_test_tools "$@" # pushd $curdir 2> /dev/null -source $curdir/test_tools/general_setup "$@" +source $HOME/test_tools/general_setup "$@" popd 2> /dev/null # Gather hardware information -$curdir/test_tools/gather_data ${curdir} +$TOOLS_BIN/gather_data ${curdir} ARGUMENT_LIST=( "commit" @@ -406,7 +406,7 @@ fi numb_cpus=`nproc` pushd coremark > /dev/null -$curdir/test_tools/package_tool --no_packages $to_no_pkg_install --wrapper_config $curdir/../coremark.json +$TOOLS_BIN/package_tool --no_packages $to_no_pkg_install --wrapper_config $curdir/../coremark.json # Get PCP setup if we're using it if [[ $to_use_pcp -eq 1 ]]; then From a17cc8cd0c45991ace813d769afeed3030b5c0b9 Mon Sep 17 00:00:00 2001 From: Keith Valin Date: Wed, 4 Feb 2026 15:19:30 -0500 Subject: [PATCH 2/3] refactor: Use package_tool convience function --- coremark/coremark_run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coremark/coremark_run b/coremark/coremark_run index 57477c5..42ffb54 100755 --- a/coremark/coremark_run +++ b/coremark/coremark_run @@ -406,7 +406,7 @@ fi numb_cpus=`nproc` pushd coremark > /dev/null -$TOOLS_BIN/package_tool --no_packages $to_no_pkg_install --wrapper_config $curdir/../coremark.json +package_tool --no_packages $to_no_pkg_install --wrapper_config $curdir/../coremark.json # Get PCP setup if we're using it if [[ $to_use_pcp -eq 1 ]]; then From 6d791f2d215bf01967c3ce93bce1cde6c050f64a Mon Sep 17 00:00:00 2001 From: Keith Valin Date: Thu, 5 Feb 2026 10:32:40 -0500 Subject: [PATCH 3/3] refactor: Use TOOLS_BIN variable for test_tools related ops --- coremark/coremark_run | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/coremark/coremark_run b/coremark/coremark_run index 8425239..3c1ca3c 100755 --- a/coremark/coremark_run +++ b/coremark/coremark_run @@ -72,13 +72,16 @@ show_usage=0 cpu_add=0 powers_2=0 +TOOLS_BIN="$HOME/test_tools" +export TOOLS_BIN + usage() { echo "Usage $1:" echo " --commit : git commit to use, default is the tag ${coremark_version}" echo " --cpu_add : starting at cpu count of 1, add this number of cpus to each run" echo " --powers_2s: starting at 1, run the number of cpus by powers of 2's" - source $HOME/test_tools/general_setup --usage + source $TOOLS_BIN/general_setup --usage exit 0 } @@ -112,8 +115,8 @@ install_test_tools() # Check to see if the test tools directory exists. If it does, we do not need to # clone the repo. # - if [ ! -d "$HOME/test_tools" ]; then - git clone $tools_git $HOME/test_tools + if [ ! -d "$TOOLS_BIN" ]; then + git clone $tools_git "$TOOLS_BIN" if [ $? -ne 0 ]; then exit_out "Error: pulling git $tools_git failed." 1 fi @@ -343,7 +346,7 @@ install_test_tools "$@" # pushd $curdir 2> /dev/null -source $HOME/test_tools/general_setup "$@" +source "$TOOLS_BIN/general_setup" "$@" popd 2> /dev/null # Gather hardware information $TOOLS_BIN/gather_data ${curdir}