From fbc2e4aade352d633547a970fdea9a8ebc301cee Mon Sep 17 00:00:00 2001 From: Jason Hiser <jdhiser@gmail.com> Date: Mon, 11 Feb 2019 11:25:12 -0500 Subject: [PATCH] updated nightly tests to elida rida+zipr only testing (redundant) and added eh-frame rewriting tests --- .gitlab-ci.yml | 18 +++++++++--------- cicd_testing/basic-pgms-fixcalls.sh | 4 ++-- cicd_testing/basic-pgms-rida.sh | 11 ----------- cicd_testing/eh-tests.sh | 10 ++++++++++ irdb_transforms | 2 +- peasoup_examples | 2 +- 6 files changed, 23 insertions(+), 24 deletions(-) delete mode 100755 cicd_testing/basic-pgms-rida.sh create mode 100755 cicd_testing/eh-tests.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba8b52ffe..716c689e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,25 +85,25 @@ xform-ls-centos75: # -# test_cmds.sh rida +# test_quick for EH handling # -.basic-pgms-rida: &basic-pgms-rida +.basic-pgms-rida: &eh-tests stage: test script: - - ./cicd_testing/basic-pgms-rida.sh + - ./cicd_testing/eh-tests.sh -basic-pgms-rida-ubuntu18: - <<: *basic-pgms-rida +eh-tests-ubuntu18: + <<: *eh-tests tags: - ubuntu18 -basic-pgms-rida-ubuntu16: - <<: *basic-pgms-rida +eh-tests-ubuntu16: + <<: *eh-tests tags: - ubuntu16 -basic-pgms-rida-centos75: - <<: *basic-pgms-rida +eh-tests-centos75: + <<: *eh-tests tags: - centos75 diff --git a/cicd_testing/basic-pgms-fixcalls.sh b/cicd_testing/basic-pgms-fixcalls.sh index ea924fe53..6ff19b192 100755 --- a/cicd_testing/basic-pgms-fixcalls.sh +++ b/cicd_testing/basic-pgms-fixcalls.sh @@ -7,6 +7,6 @@ source set_env_vars cd $CICD_TO_TEST_DIR/peasoup_examples/tests cd $PEASOUP_HOME/tests make clean; -./test_cmds.sh -c fix_calls_rida -l -./test_cmds.sh -c fix_calls_ida -l +./test_cmds.sh -c fix_calls_rida -l -a "bzip2 tcpdump" +./test_cmds.sh -c fix_calls_ida -l -a "bzip2 tcpdump" diff --git a/cicd_testing/basic-pgms-rida.sh b/cicd_testing/basic-pgms-rida.sh deleted file mode 100755 index 6a674cf37..000000000 --- a/cicd_testing/basic-pgms-rida.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e -set -x - -cd /tmp/peasoup_test -source set_env_vars -cd $CICD_TO_TEST_DIR/peasoup_examples/tests -cd $PEASOUP_HOME/tests -make clean; ./test_cmds.sh -c orig -l -make clean; ./test_cmds.sh -c rida -l - diff --git a/cicd_testing/eh-tests.sh b/cicd_testing/eh-tests.sh new file mode 100755 index 000000000..b1a4bb2da --- /dev/null +++ b/cicd_testing/eh-tests.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -e +set -x + +cd /tmp/peasoup_test +source set_env_vars +cd $CICD_TO_TEST_DIR/peasoup_examples/cpp-examples +cd $PEASOUP_HOME/cpp-examples +./test_quick.sh + diff --git a/irdb_transforms b/irdb_transforms index 4d2af8676..ae833c629 160000 --- a/irdb_transforms +++ b/irdb_transforms @@ -1 +1 @@ -Subproject commit 4d2af8676c53e3e8e16b819fff5ccc8eb98a243b +Subproject commit ae833c6296d78e5fd564b1c6ed47ad1848a4d13d diff --git a/peasoup_examples b/peasoup_examples index 4311201dd..982935d9a 160000 --- a/peasoup_examples +++ b/peasoup_examples @@ -1 +1 @@ -Subproject commit 4311201ddcd11ac25e3ae5dacb89e2017e5f4b54 +Subproject commit 982935d9a8979f0d9c8cdaffae01a7d553135e29 -- GitLab