From e07cb807e17e24694a5eba9359a8eaa89f57a41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sun, 18 Aug 2019 15:13:00 +0200
Subject: [PATCH] Make generate_and_run_more_tests happy

---
 tools/run_more_tests.sh | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/tools/run_more_tests.sh b/tools/run_more_tests.sh
index 4072635de..e16f50ec2 100755
--- a/tools/run_more_tests.sh
+++ b/tools/run_more_tests.sh
@@ -7,90 +7,90 @@ python tools/extracttests.py --code=test1 $1
 
 cd test1
 
-../cppcheck -q . 2> 1.txt
+../cppcheck -q --template=cppcheck1 . 2> 1.txt
 
 
 # (!x) => (x==0)
 sed  -ri 's/([(&][ ]*)\!([a-z]+)([ ]*[&)])/\1\2==0\3/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (x==0) => (0==x)
 sed  -ri 's/([(&][ ]*)([a-z]+)[ ]*==[ ]*0([ ]*[&)])/\10==\2\3/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (0==x) => (!x)
 sed  -ri 's/([(&][ ]*)0[ ]*==[ ]*([a-z]+)([ ]*[&)])/\1!\2\3/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 
 
 
 # if (x) => (x!=0)
 sed  -ri 's/(if[ ]*\([ ]*[a-z]+)([ ]*[&)])/\1!=0\2/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # while (x) => (x!=0)
 sed  -ri 's/(while[ ]*\([ ]*[a-z]+)([ ]*[&)])/\1!=0\2/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (x!=0) => (0!=x)
 sed  -ri 's/([(&][ ]*)([a-z]+)[ ]*!=[ ]*0([ ]*[&)])/\10!=\2\3/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (0!=x) => (x)
 sed  -ri 's/([(&][ ]*)0[ ]*!=[ ]*([a-z]+[ ]*[&)])/\1\2/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 
 # (x < 0) => (0 > x)
 sed  -ri 's/([(&][ ]*)([a-z]+)[ ]*<[ ]*(\-?[0-9]+)([ ]*[&)])/\1\3>\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (x <= 0) => (0 >= x)
 sed  -ri 's/([(&][ ]*)([a-z]+)[ ]*<=[ ]*(\-?[0-9]+)([ ]*[&)])/\1\3>=\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (x > 0) => (0 < x)
 sed  -ri 's/([(&][ ]*)([a-z]+)[ ]*<=[ ]*(\-?[0-9]+)([ ]*[&)])/\1\3>=\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (x >= 0) => (0 <= x)
 sed  -ri 's/([(&][ ]*)([a-z]+)[ ]*<=[ ]*(\-?[0-9]+)([ ]*[&)])/\1\3>=\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (x == 123) => (123 == x)
 sed  -ri 's/([(&][ ]*)([a-z]+)[ ]*==[ ]*(\-?[0-9]+)([ ]*[&)])/\1\3==\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (x != 123) => (123 != x)
 sed  -ri 's/([(&][ ]*)([a-z]+)[ ]*\!=[ ]*(\-?[0-9]+)([ ]*[&)])/\1\3!=\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 
 
 # (0 < x) => (x > 0)
 sed  -ri 's/([(&][ ]*)(\-?[0-9]+)[ ]*<[ ]*([a-z]+)([ ]*[&)])/\1\3>\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (0 <= x) => (x >= 0)
 sed  -ri 's/([(&][ ]*)(\-?[0-9]+)[ ]*<=[ ]*([a-z]+)([ ]*[&)])/\1\3>=\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (0 > x) => (x < 0)
 sed  -ri 's/([(&][ ]*)(\-?[0-9]+)[ ]*<=[ ]*([a-z]+)([ ]*[&)])/\1\3>=\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (0 >= x) => (x <= 0)
 sed  -ri 's/([(&][ ]*)(\-?[0-9]+)[ ]*<=[ ]*([a-z]+)([ ]*[&)])/\1\3>=\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (123 == x) => (x == 123)
 sed  -ri 's/([(&][ ]*)(\-?[0-9]+)[ ]*==[ ]*([a-z]+)([ ]*[&)])/\1\3==\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 # (123 != x) => (x <= 123)
 sed  -ri 's/([(&][ ]*)(\-?[0-9]+)[ ]*\!=[ ]*([a-z]+)([ ]*[&)])/\1\3!=\2\4/' *.cpp
-../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
+../cppcheck -q --template=cppcheck1 . 2> 2.txt && diff 1.txt 2.txt
 
 
 cd ..