.gitignore

@@ -4,4 +4,6 @@ src/build
 *.osNAI
 *.so
 .sconsign.dblite
+deb/libzafl/
+*.deb
 

.gitlab-ci.yml

+before_script:
+  - "source ~gitlab-runner/cicd_support/cicd_support.shinc" 
+
+after_script:
+  - "source ~gitlab-runner/cicd_support/cicd_support.shinc" 
+
+stages:
+  - test
+
+#
+# $PSZ ls
+#
+
+.xform-ls: &xform-ls
+  stage: test
+  script:
+    - ./cicd_testing/xform-ls.sh
+
+
+xform-ls-ubuntu18:
+  <<: *xform-ls
+  tags:
+    - ubuntu18
+
+xform-ls-ubuntu16:
+  <<: *xform-ls
+  tags:
+    - ubuntu16
+
+
+
+
+

README.md

@@ -9,6 +9,7 @@ PREREQS
 SCons
 GCC
 dpkg
+fakeroot
 
 BUILDING
 -------

cicd_testing/xform-ls.sh

+#!/bin/bash
+set -e
+set -x
+
+export ZAFL_PATH=git.zephyr-software.com:4567/allnp/zafl_umbrella/
+export ZAFL_TAG=zafl:latest
+export DOCKER_ZAFL=${ZAFL_PATH}${ZAFL_TAG}
+
+
+do_login()
+{
+
+        # login to gitlab's docker registry as gitlab-user
+        docker login $ZAFL_PATH -u gitlab-runner -p 84MyuSuDo4kQat4GZ_Zs  2> /dev/null
+}
+
+
+do_clean()
+{
+	rm -f *.deb
+	scons -c
+	docker logout $ZAFL_PATH || true
+}
+
+do_test()
+{
+	scons
+	sudo dpkg -i *.deb
+	# allow these to fail so we can clean up
+	set +e
+	docker run -v /bin:/in -v /tmp:/out $DOCKER_ZAFL /in/ls /out/ls.zafl
+	local res1=$?
+	/tmp/ls.zafl -l 
+	set -e
+	local res2=$?
+
+	sudo apt-get remove libzafl -y
+
+	if [[ $res1 != 0 ]] || [[ $res2 != 0 ]]; then
+		exit 1
+	fi
+
+	
+}
+
+
+main()
+{
+	do_clean
+	do_login
+	do_test
+	do_clean
+	
+}
+
+main "$@"
+
+

src/SConscript

@@ -2,13 +2,10 @@ import os
 
 Import('env')
 myenv=env.Clone()
-myenv.Replace(ZEST_RUNTIME=os.environ['ZEST_RUNTIME'])
-myenv.Replace(AFL_PATH=os.environ['AFL_PATH'])
 
 files="libzafl.c"
 
 cpath='''
-        $AFL_PATH/
         ../include/
         '''
 

src/libzafl.c

@@ -117,6 +117,7 @@ void zafl_initAflForkServer()
 
 	fork_server_initialized = 1;
 
+	// afl forkserver handshake
 	while(1) {
 		n = read(FORKSRV_FD,&__afl_temp_data,4);
 		if(n != 4) {
@@ -146,8 +147,7 @@ void zafl_initAflForkServer()
 	}
 }
 
-// for efficiency, basic block instrumentation is inlined via a Zipr transformation
-// this code is used for debugging purposes only
+// debugging code below
 void zafl_bbInstrument(unsigned short id) {
 	zafl_trace_map[zafl_prev_id ^ id]++;
 	zafl_prev_id = id >> 1;
@@ -159,7 +159,7 @@ void zafl_dumpTracemap()
 	if (!debug) return;
 	if (!zafl_trace_map) return;
 
-	for (i = 0; i < 0xFFFF; ++i)
+	for (i = 0; i < MAP_SIZE; ++i)
 	{
 		if (zafl_trace_map[i]!=0)
 			printf("%x:%d\n",i, zafl_trace_map[i]);