From 216763af3c6f64173870121b0e4dcad01ff39d2d Mon Sep 17 00:00:00 2001
From: Anh Nguyen <zenpoems@gmail.com>
Date: Thu, 19 Mar 2020 17:02:58 -0700
Subject: [PATCH] Restore tests
---
.gitlab-ci.yml | 115 ++++++++++++++++----------------
cicd_testing/afl-zafl.sh | 7 +-
cicd_testing/basic-pgms-zafl.sh | 6 +-
3 files changed, 61 insertions(+), 67 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1e8e49..722c94b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,15 +25,15 @@ do-nightly-clean-ubuntu18:
tags:
- ubuntu18
-#do-nightly-clean-ubuntu16:
-# <<: *do-nightly-clean
-# tags:
-# - ubuntu16
-#
-#do-nightly-clean-centos76:
-# <<: *do-nightly-clean
-# tags:
-# - centos76
+do-nightly-clean-ubuntu16:
+ <<: *do-nightly-clean
+ tags:
+ - ubuntu16
+
+do-nightly-clean-centos76:
+ <<: *do-nightly-clean
+ tags:
+ - centos76
#
@@ -49,64 +49,63 @@ do-build-ubuntu18:
<<: *do-build
tags:
- ubuntu18
-#
-#do-build-ubuntu16:
-# <<: *do-build
-# tags:
-# - ubuntu16
-#
-#do-build-centos76:
-# <<: *do-build
-# tags:
-# - centos76
-#
+
+do-build-ubuntu16:
+ <<: *do-build
+ tags:
+ - ubuntu16
+
+do-build-centos76:
+ <<: *do-build
+ tags:
+ - centos76
+
#
# test_cmds.sh zafl
#
-#.basic-pgms-zafl: &basic-pgms-zafl
-# stage: test
-# script:
-# - ./cicd_testing/basic-pgms-zafl.sh
-
-#basic-pgms-zafl-ubuntu18:
-# <<: *basic-pgms-zafl
-# tags:
-# - ubuntu18
-
-#basic-pgms-zafl-ubuntu16:
-# <<: *basic-pgms-zafl
-# tags:
-# - ubuntu16
-#
-#basic-pgms-zafl-centos76:
-# <<: *basic-pgms-zafl
-# tags:
-# - centos76
+.basic-pgms-zafl: &basic-pgms-zafl
+ stage: test
+ script:
+ - ./cicd_testing/basic-pgms-zafl.sh
+
+basic-pgms-zafl-ubuntu18:
+ <<: *basic-pgms-zafl
+ tags:
+ - ubuntu18
+
+basic-pgms-zafl-ubuntu16:
+ <<: *basic-pgms-zafl
+ tags:
+ - ubuntu16
+
+basic-pgms-zafl-centos76:
+ <<: *basic-pgms-zafl
+ tags:
+ - centos76
#
# test zafl with afl
#
-#.afl-zafl: &afl-zafl
-# stage: test
-# script:
-# - ./cicd_testing/afl-zafl.sh
-#
-#afl-zafl-ubuntu18:
-# <<: *afl-zafl
-# tags:
-# - ubuntu18
-
-#afl-zafl-ubuntu16:
-# <<: *afl-zafl
-# tags:
-# - ubuntu16
-#
-#afl-zafl-centos76:
-# <<: *afl-zafl
-# tags:
-# - centos76
+.afl-zafl: &afl-zafl
+ stage: test
+ script:
+ - ./cicd_testing/afl-zafl.sh
+
+afl-zafl-ubuntu18:
+ <<: *afl-zafl
+ tags:
+ - ubuntu18
+
+afl-zafl-ubuntu16:
+ <<: *afl-zafl
+ tags:
+ - ubuntu16
+afl-zafl-centos76:
+ <<: *afl-zafl
+ tags:
+ - centos76
#
# Deploy a docker image to gitlab.
diff --git a/cicd_testing/afl-zafl.sh b/cicd_testing/afl-zafl.sh
index b93fb1b..ffced6f 100755
--- a/cicd_testing/afl-zafl.sh
+++ b/cicd_testing/afl-zafl.sh
@@ -13,11 +13,8 @@ sudo $ZAFL_HOME/util/afl_setup_core_pattern.sh
echo "Test various zafl configurations"
$ZAFL_HOME/test/strings/test_strings.sh
-
-exit 0
-
-$ZAFL_HOME//test/bc/test_bc.sh
-$ZAFL_HOME//test/od/test_od.sh
+$ZAFL_HOME/test/bc/test_bc.sh
+$ZAFL_HOME/test/od/test_od.sh
echo "Test graph optimizations"
$ZAFL_HOME/tools/zax/test/test_graph.sh
diff --git a/cicd_testing/basic-pgms-zafl.sh b/cicd_testing/basic-pgms-zafl.sh
index 44e94cd..b6107ee 100755
--- a/cicd_testing/basic-pgms-zafl.sh
+++ b/cicd_testing/basic-pgms-zafl.sh
@@ -16,10 +16,8 @@ main()
benchmarks="tcpdump ncal bzip2 tar"
configs="zafl_nostars zafl_untracer_critical_edges zafl_context_sensitive_laf_domgraph_optgraph"
else
-# benchmarks="readelf touch"
-# configs="zafl_untracer_critical_edges zafl_context_sensitive_laf_domgraph_optgraph"
- benchmarks="touch"
- configs="zafl_context_sensitive_laf_domgraph_optgraph"
+ benchmarks="readelf touch"
+ configs="zafl_untracer_critical_edges zafl_context_sensitive_laf_domgraph_optgraph"
fi
# test other zafl configs on various apps
--
GitLab