From c30cf0a2017e7a9f878755f1c67e54d3fdd98b88 Mon Sep 17 00:00:00 2001 From: Jason Hiser <jdhiser@gmail.com> Date: Tue, 30 May 2023 21:19:14 -0400 Subject: [PATCH] Convert CI to idapro 8.2 --- cicd_testing/builtin-xforms.sh | 4 ++-- cicd_testing/do-build.sh | 8 ++++---- cicd_testing/do-prot-bins.sh | 4 ++-- cicd_testing/elfdep.sh | 4 ++-- cicd_testing/go_tests.sh | 4 ++-- cicd_testing/libc_test.sh | 4 ++-- cicd_testing/rust_tests.sh | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cicd_testing/builtin-xforms.sh b/cicd_testing/builtin-xforms.sh index 937214c14..b2318ce71 100755 --- a/cicd_testing/builtin-xforms.sh +++ b/cicd_testing/builtin-xforms.sh @@ -3,8 +3,8 @@ set -e set -x cd /tmp/peasoup_test -export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71 -export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk +export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3 +export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk source set_env_vars cd $PEASOUP_HOME/tests diff --git a/cicd_testing/do-build.sh b/cicd_testing/do-build.sh index b7edd2515..d11b1e5a2 100755 --- a/cicd_testing/do-build.sh +++ b/cicd_testing/do-build.sh @@ -13,10 +13,10 @@ whoami env|grep CICD time rsync -a --exclude='.git' $CICD_TO_TEST_DIR/ /tmp/peasoup_test -cicd_setup_module_dependency allzp/idapro71.git idapro71 -export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71 -cicd_setup_module_dependency allzp/idapro71_sdk.git idapro71_sdk -export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk +cicd_setup_module_dependency allzp/idapro82sp1py3.git idapro82sp1py3 +export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3 +cicd_setup_module_dependency allzp/idapro82_sdk.git idapro82_sdk +export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk cd /tmp/peasoup_test source set_env_vars diff --git a/cicd_testing/do-prot-bins.sh b/cicd_testing/do-prot-bins.sh index 1bc20bd86..b9371051c 100755 --- a/cicd_testing/do-prot-bins.sh +++ b/cicd_testing/do-prot-bins.sh @@ -4,8 +4,8 @@ set -e set -x pushd /tmp/peasoup_test -export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71 -export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk +export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3 +export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk source set_env_vars popd diff --git a/cicd_testing/elfdep.sh b/cicd_testing/elfdep.sh index 31689b17c..622027010 100755 --- a/cicd_testing/elfdep.sh +++ b/cicd_testing/elfdep.sh @@ -3,8 +3,8 @@ set -e set -x cd /tmp/peasoup_test -export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71 -export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk +export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3 +export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk source set_env_vars cd $PEASOUP_HOME/irdb-libs//libIRDB-elfdep/test/ diff --git a/cicd_testing/go_tests.sh b/cicd_testing/go_tests.sh index 37566bf91..4afe83168 100755 --- a/cicd_testing/go_tests.sh +++ b/cicd_testing/go_tests.sh @@ -3,8 +3,8 @@ set -e set -x cd /tmp/peasoup_test -export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71 -export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk +export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3 +export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk source set_env_vars cd $PEASOUP_HOME/tests/go_test/ diff --git a/cicd_testing/libc_test.sh b/cicd_testing/libc_test.sh index 14f5fe3e0..5d6c0bc02 100755 --- a/cicd_testing/libc_test.sh +++ b/cicd_testing/libc_test.sh @@ -3,8 +3,8 @@ set -e set -x cd /tmp/peasoup_test -export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71 -export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk +export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3 +export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk source set_env_vars cd $PEASOUP_HOME/tests/libc/ diff --git a/cicd_testing/rust_tests.sh b/cicd_testing/rust_tests.sh index ba08fc0d6..65cec5495 100755 --- a/cicd_testing/rust_tests.sh +++ b/cicd_testing/rust_tests.sh @@ -3,8 +3,8 @@ set -e set -x cd /tmp/peasoup_test -export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71 -export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk +export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3 +export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk source set_env_vars cd $PEASOUP_HOME/tests/rust_test/ -- GitLab