Biflow Aggregator - Fix pipeline

Author: Damir Zainullin

Makefile.am

@@ -1,10 +1,10 @@
 ACLOCAL_AMFLAGS = -I m4
 
+# Biflow aggregator depends on logger and logreplay
 SUBDIRS= \
 aggregator \
 anonymizer \
 backscatter \
-biflow_aggregator \
 debug_sender \
 device_classifier \
 email_reporter \
@@ -31,6 +31,7 @@ topn \
 traffic_repeater \
 unirec2json \
 endiverter \
+biflow_aggregator \
 googletest_example
 
 EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL NEWS README.md nfreader \

biflow_aggregator/Makefile.am

@@ -7,3 +7,8 @@ biflow_aggregator_LDADD=-lunirec -ltrap
 include ../aminclude.am
 
 TESTS = tests/test.sh
+
+EXTRA_DIST = tests/test.sh \
+	     tests/references \
+	     tests/inputs \
+	     tests/config.xml

biflow_aggregator/tests/test.sh

@@ -14,20 +14,20 @@ run_test_with_global_timeout() {
     local input=$1
     local output=$2
     local reference=$3
-    local config=$4
-    local global_timeout=$5
-
-    (../biflow_aggregator -i "u:lr,u:ba" -e -c config.xml -n $config -g $global_timeout & ) || true
+    local section=$4
+    local config=$5
+    local global_timeout=$6
+    (./biflow_aggregator -i "u:lr,u:ba" -e -c $config -n $section -g $global_timeout & ) || true
     local AGGREGATOR_PID=$!
     sleep 0.5
     die_if_not_running $AGGREGATOR_PID "Failed to start biflow aggregator"
 
-    ../../logger/logger -w $output -i "u:ba" &  
+    ./../logger/logger -w $output -i "u:ba" &  
     local LOGGER_PID=$!
     sleep 0.5
     die_if_not_running $LOGGER_PID "Failed to start logger"
 
-    ../../logreplay/logreplay -f $input -i "u:lr" &  
+    ./../logreplay/logreplay -f $input -i "u:lr" &  
     local LOGREPLAY_PID=$!
     sleep 0.5
     die_if_not_running $LOGREPLAY_PID "Failed to start logreplay"
@@ -39,38 +39,49 @@ run_test_with_global_timeout() {
     kill $LOGGER_PID 2>/dev/null
     wait $LOGGER_PID
 
-    if ! colordiff $output $reference; then
+    if ! diff $output $reference; then
         echo $output doesnt match $reference
         success="false"
     fi
 }
+    pwd >&2
 
 script_path="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-cd $script_path
+
 success="true"
-mkdir -p outputs 
-for input in inputs/input*; do
+
+tmpdir=$(mktemp -d)
+
+trap "rm -rf \"$tmpdir\"" EXIT
+
+outputs="$tmpdir/outputs"
+
+mkdir -p "$outputs" 
+
+
+for input in "$script_path"/inputs/input*; do
     basename=$(basename "$input")
     echo Found $basename
     if [[ $basename =~ input([0-9]+)_(.+) ]]; then
         index="${BASH_REMATCH[1]}"
-        config="${BASH_REMATCH[2]}"
-        output=outputs/output$index
-        reference=references/reference$index
+        section="${BASH_REMATCH[2]}"
+        output="$outputs/output$index"
+	config="$script_path/config.xml"
+        reference="$script_path/references/reference$index"
     else    
         echo $input
         echo "Incorrect input name. Must be input<index>_<config_name>"
         exit 1
     fi
 
     echo "Running test without global timeout..."
-    run_test_with_global_timeout $input ${output}_gt0 ${reference}_gt0 $config "0"
+    run_test_with_global_timeout $input ${output}_gt0 ${reference}_gt0 $section $config "0"
 
     echo "Running test with relative global timeout..."
-    run_test_with_global_timeout $input ${output}_gt5r ${reference}_gt5r $config "5r"
+    run_test_with_global_timeout $input ${output}_gt5r ${reference}_gt5r $section $config "5r"
 
     echo "Running test with absolute global timeout..."
-    run_test_with_global_timeout $input ${output}_gt5a ${reference}_gt5a $config "5a"
+    run_test_with_global_timeout $input ${output}_gt5a ${reference}_gt5a $section $config "5a"
 
 done
 
@@ -79,4 +90,4 @@ if [ "$success" = "true" ]; then
 else
     echo "Some tests failed."
     exit 1
-fi
+fi

logger/Makefile.am

@@ -6,3 +6,4 @@ pkgdocdir=${docdir}/logger
 pkgdoc_DATA=README.md
 EXTRA_DIST=README.md csv2nf.sh
 include ../aminclude.am
+check_PROGRAMS = logger

logreplay/Makefile.am

@@ -6,3 +6,4 @@ pkgdocdir=${docdir}/logreplay
 pkgdoc_DATA=README.md
 EXTRA_DIST=README.md
 include ../aminclude.am
+check_PROGRAMS = logreplay