summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2024-09-07 18:01:46 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2024-09-07 18:01:46 -0400
commit1d92b9f39ba0575370305aad1239d13b1fc58fa8 (patch)
treee2c826e10c76ddfeb26c2eaaed0157605a1ad020
parente3db9b12f236db16c307656e4250814cb7a54f5d (diff)
fix bcachefs/32bit.ktest
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
-rw-r--r--cross.conf2
-rw-r--r--lib/common.sh5
-rwxr-xr-xtests/fs/bcachefs/32bit.ktest2
3 files changed, 6 insertions, 3 deletions
diff --git a/cross.conf b/cross.conf
index 2896885..6d179de 100644
--- a/cross.conf
+++ b/cross.conf
@@ -2,7 +2,7 @@
# whenever these need to be changed (some distributions prefer ARCHITECTURE-VENDOR-OS-LIBC),
# change the triplet here
-ARCH_TRIPLE_X86=x86-linux-gnu
+ARCH_TRIPLE_X86=x86_64-linux-gnu
ARCH_TRIPLE_X86_64=x86_64-linux-gnu
ARCH_TRIPLE_ARM64=aarch64-linux-gnu
diff --git a/lib/common.sh b/lib/common.sh
index 078f512..5789698 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -80,7 +80,10 @@ join_by()
echo "$*"
}
-ktest_arch=$(uname -m)
+if [[ ! -v ktest_arch ]]; then
+ ktest_arch=$(uname -m)
+fi
+
CROSS_COMPILE=""
parse_arch()
diff --git a/tests/fs/bcachefs/32bit.ktest b/tests/fs/bcachefs/32bit.ktest
index 1d47afc..6a885fd 100755
--- a/tests/fs/bcachefs/32bit.ktest
+++ b/tests/fs/bcachefs/32bit.ktest
@@ -2,7 +2,7 @@
ktest_arch=x86
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../bcachefs-test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/bcachefs-test-libs.sh
config-timeout 30