From 1fb7fa44b8dbcc3303302f7415d395faa298b100 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Mon, 4 Mar 2019 17:05:23 -0500
Subject: [PATCH] updated testing to reflect what it does. fixed p1 issue
---
.gitlab-ci.yml | 30 +++++++++++++--------------
builtin_xforms/p1transform/SConscript | 2 +-
cicd_testing/basic-pgms-fixcalls.sh | 11 ----------
cicd_testing/builtin-xforms.sh | 9 ++++++++
4 files changed, 25 insertions(+), 27 deletions(-)
delete mode 100755 cicd_testing/basic-pgms-fixcalls.sh
create mode 100755 cicd_testing/builtin-xforms.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2599fb76b..6e6966a8d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,46 +80,46 @@ do-build-centos75:
#
# test_quick for EH handling
#
-.basic-pgms-rida: &eh-tests
+.basic_eh_tests: &basic_eh-tests
stage: test
script:
- ./cicd_testing/eh-tests.sh
-eh-tests-ubuntu18:
- <<: *eh-tests
+basic_eh-tests-ubuntu18:
+ <<: *basic_eh-tests
tags:
- ubuntu18
-eh-tests-ubuntu16:
- <<: *eh-tests
+basic_eh-tests-ubuntu16:
+ <<: *basic_eh-tests
tags:
- ubuntu16
-eh-tests-centos75:
- <<: *eh-tests
+basic_eh-tests-centos75:
+ <<: *basic_eh-tests
tags:
- centos75
#
# test_cmds.sh fixcalls
#
-.basic-pgms-fixcalls: &basic-pgms-fixcalls
+.builtin-xforms: &builtin-xforms
stage: test
script:
- - ./cicd_testing/basic-pgms-fixcalls.sh
+ - ./cicd_testing/builtin-xforms.sh
-basic-pgms-fixcalls-ubuntu18:
- <<: *basic-pgms-fixcalls
+builtin-xforms-ubuntu18:
+ <<: *builtin-xforms
tags:
- ubuntu18
-basic-pgms-fixcalls-ubuntu16:
- <<: *basic-pgms-fixcalls
+builtin-xforms-ubuntu16:
+ <<: *builtin-xforms
tags:
- ubuntu16
-basic-pgms-fixcalls-centos75:
- <<: *basic-pgms-fixcalls
+builtin-xforms-centos75:
+ <<: *builtin-xforms
tags:
- centos75
variables:
diff --git a/builtin_xforms/p1transform/SConscript b/builtin_xforms/p1transform/SConscript
index 85bebeb8c..8e1b35d99 100644
--- a/builtin_xforms/p1transform/SConscript
+++ b/builtin_xforms/p1transform/SConscript
@@ -4,7 +4,7 @@ Import('env')
myenv=env.Clone()
-LIBS= " irdb-cfg irdb-transform irdb-core "
+LIBS= " irdb-cfg irdb-transform irdb-core EXEIO "
cpppath='''
$IRDB_SDK/include
diff --git a/cicd_testing/basic-pgms-fixcalls.sh b/cicd_testing/basic-pgms-fixcalls.sh
deleted file mode 100755
index 7df0717f4..000000000
--- a/cicd_testing/basic-pgms-fixcalls.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-cd /tmp/peasoup_test
-source set_env_vars
-cd $PEASOUP_HOME/tests
-make clean;
-./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/builtin-xforms.sh b/cicd_testing/builtin-xforms.sh
new file mode 100755
index 000000000..01230ecb6
--- /dev/null
+++ b/cicd_testing/builtin-xforms.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+set -x
+
+cd /tmp/peasoup_test
+source set_env_vars
+cd $PEASOUP_HOME/tests
+make clean;
+./test_cmds.sh -c "fix_calls_rida rida_p1 fix_calls_ida" -l -a "bzip2 tcpdump"
--
GitLab