From f30b22bdabc3105cc4c92da60d80b48a7f28fef4 Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harryhaaren@gmail.com>
Date: Sun, 15 Sep 2013 16:48:21 +0100
Subject: [PATCH] -Updated test.sh

---
 test.sh | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/test.sh b/test.sh
index e1b5230..f99f064 100755
--- a/test.sh
+++ b/test.sh
@@ -2,50 +2,22 @@
 # Tup with CONFIG_LUPPP_BUILD_TESTS=y
 
 # Compile with:
-<<<<<<< HEAD
 # define BUILD_TESTS
 # define BUILD_COVERAGE_TEST
 # -lgcov
-=======
-#define BUILD_TESTS
-#define BUILD_COVERAGE_TEST
-#-lgcov
->>>>>>> master
 
-
-<<<<<<< HEAD
 # run the tests:
 #  Luppp quits after tests are finished
 #  gcov scrapes .gcna / .gcdo files, produces .gcov files
 #  cp source files into dir: needed for analysis by lcov
 #  lcov scrapes .gcov files into lcov.info
 #  genhtml produces index.html from lcov.info
-=======
-# Run gcov on each file, it shows output data:
-
-cd testBuild/src/
-
-gcov -r -b *.gcda
->>>>>>> master
 
 cd testBuild/
 
-<<<<<<< HEAD
 ./luppp
 
 cd src
-=======
-
-#rm src/*.gcda
-#rm src/*.gcno
-
-#rm src/lcov.info
-#rm src/gcov.css
-#rm src/*.html
-#rm src/*.png
-
-#rm gcov.data
->>>>>>> master
 
 gcov -r -b *
 cp -r ../../src/* ./