From a07685ac296f3e1bc8ec664efa71281ab00193d3 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Thu, 11 Jul 2019 21:58:22 -0400
Subject: [PATCH] added arm tests
---
.gitlab-ci.yml | 15 +++++++++++++++
cicd_testing/builtin-xforms.sh | 8 +++++++-
cicd_testing/xform-ls.sh | 12 ------------
3 files changed, 22 insertions(+), 13 deletions(-)
delete mode 100755 cicd_testing/xform-ls.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfbb4f935..7cefe8735 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,6 +154,21 @@ builtin-xforms-centos76:
variables:
OS: 'centos76'
+builtin-xforms-arm32:
+ <<: *builtin-xforms
+ tags:
+ - arm32
+ variables:
+ OS: 'arm32'
+
+builtin-xforms-arm64:
+ <<: *builtin-xforms
+ tags:
+ - arm64
+ variables:
+ OS: 'arm64'
+
+
#
# elfdep test
#
diff --git a/cicd_testing/builtin-xforms.sh b/cicd_testing/builtin-xforms.sh
index baee32ab6..8f90a8c2f 100755
--- a/cicd_testing/builtin-xforms.sh
+++ b/cicd_testing/builtin-xforms.sh
@@ -5,5 +5,11 @@ set -x
cd /tmp/peasoup_test
source set_env_vars
cd $PEASOUP_HOME/tests
+
make clean;
-./test_cmds.sh -c "fix_calls_rida fix_calls_ida" -l -a "bzip2 tcpdump"
+if [[ $(uname -m) == 'armv7l' ]] || [[ $(uname -m) == 'aarch64' ]]; then
+ ./test_cmds.sh -c "zipr_rida" -l -a "bzip2 ls"
+else
+ ./test_cmds.sh -c "zipr_rida fix_calls_rida fix_calls_ida" -l -a "bzip2 tcpdump"
+fi
+
diff --git a/cicd_testing/xform-ls.sh b/cicd_testing/xform-ls.sh
deleted file mode 100755
index 086ee0160..000000000
--- a/cicd_testing/xform-ls.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-cd /tmp/peasoup_test
-source set_env_vars
-cd /tmp
-rm -rf xxx ped_ls; $PSZ /bin/ls ./xxx -c rida=on -s meds_static=off --tempdir ped_ls || true
-if [[ ! -x ./xxx ]]; then cat ped_ls/logs/*; fi
-rm -rf ped_ls
-./xxx
-
--
GitLab