From 926d8c0d5dd12186c1160dfbff982894f559b74e Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Tue, 3 Sep 2019 14:51:06 -0400
Subject: [PATCH] updated tests
---
.gitlab-ci.yml | 6 +++---
cicd_testing/do-build.sh | 1 -
cicd_testing/do-test.sh | 4 +++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 356ada3..5308b14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ do-build-ubuntu18:
# Testing
#
do-test-ubuntu18:
- stage: build
+ stage: test
script:
- ./cicd_testing/do-test.sh
tags:
@@ -49,7 +49,7 @@ do-test-ubuntu18:
# Turbo Fuzzing
#
do-fuzz-ubuntu18:
- stage: build
+ stage: fuzz
script:
- ./cicd_testing/do-fuzz.sh
tags:
@@ -59,7 +59,7 @@ do-fuzz-ubuntu18:
# Deploy
#
do-deploy-ubuntu18:
- stage: build
+ stage: deploy
script:
- ./cicd_testing/do-deploy.sh
tags:
diff --git a/cicd_testing/do-build.sh b/cicd_testing/do-build.sh
index a0049e3..02d6743 100755
--- a/cicd_testing/do-build.sh
+++ b/cicd_testing/do-build.sh
@@ -14,6 +14,5 @@ env|grep CICD
time rsync -a --exclude='.git' $CICD_TO_TEST_DIR/ /tmp/libehp_test
cd /tmp/libehp_test
-source set_env_vars
scons -j 3
diff --git a/cicd_testing/do-test.sh b/cicd_testing/do-test.sh
index 2ce5fd7..d458f8a 100755
--- a/cicd_testing/do-test.sh
+++ b/cicd_testing/do-test.sh
@@ -6,7 +6,9 @@ set -x
function main()
{
- cd /tmp/libehp_test/test
+ cd /tmp/libehp_test
+ scons -j3
+ cd test
./test.sh
exit 0
}
--
GitLab