From 3f09c82c2bdd9b970f075762174f08e98cea62f2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Jun 2016 16:19:20 +0300 Subject: Add more tests. --- tools/ci/jobs/deheader.sh | 8 ++++---- tools/ci/samples/test3.h | 4 ++++ tools/ci/samples/test4.h | 4 ++++ tools/ci/samples/test7.cpp | 16 ++++++++++++++++ tools/ci/samples/test7.h | 16 ++++++++++++++++ 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 tools/ci/samples/test7.cpp create mode 100644 tools/ci/samples/test7.h (limited to 'tools') diff --git a/tools/ci/jobs/deheader.sh b/tools/ci/jobs/deheader.sh index ff9c4db..0b4e624 100755 --- a/tools/ci/jobs/deheader.sh +++ b/tools/ci/jobs/deheader.sh @@ -7,15 +7,15 @@ source ./tools/ci/scripts/init.sh aptget_install python gcc-5 g++-5 export dir=$(pwd) -export var=$2 +export var=$3 export name=${var%.*} export name=${name#./src/} export name=${name##*./}.h -echo $2 >>${LOGFILE} -echo $2 +echo $3 >>${LOGFILE} +echo $3 ${dir}/deheader -q \ -c "$1" \ --m "-c -std=gnu++1z -Werror -Wall -Wextra -Wundef -Wmissing-declarations -I/usr/include -I${dir}/tools/ci/samples" ${dir}/tools/ci/samples/$2 \ +-m "-c -std=gnu++1z -Werror -Wall -Wextra -Wundef -Wmissing-declarations $2 -I/usr/include -I${dir}/tools/ci/samples" ${dir}/tools/ci/samples/$3 \ | grep -v "portability requires" | tee -a ${LOGFILE} diff --git a/tools/ci/samples/test3.h b/tools/ci/samples/test3.h index 7f2669e..3e82ac1 100644 --- a/tools/ci/samples/test3.h +++ b/tools/ci/samples/test3.h @@ -1,6 +1,10 @@ #ifndef TEST3 #define TEST3 +#ifndef QQQ +#include "include1.h" +#endif // QQQ + int function1(); #endif // TEST3 \ No newline at end of file diff --git a/tools/ci/samples/test4.h b/tools/ci/samples/test4.h index f578ad2..244345a 100644 --- a/tools/ci/samples/test4.h +++ b/tools/ci/samples/test4.h @@ -3,4 +3,8 @@ int function1(); +#ifdef QQQ +#include "include1.h" +#endif // QQQ + #endif // TEST4 \ No newline at end of file diff --git a/tools/ci/samples/test7.cpp b/tools/ci/samples/test7.cpp new file mode 100644 index 0000000..ab5c327 --- /dev/null +++ b/tools/ci/samples/test7.cpp @@ -0,0 +1,16 @@ +#include "test7.h" + +#ifndef QQQ +#include "include1.h" +#else // QQQ +#include "include2.h" +#endif // QQQ + +int function1() +{ + return 0; +} + +#ifdef QQQ +#include "include3.h" +#endif // QQQ diff --git a/tools/ci/samples/test7.h b/tools/ci/samples/test7.h new file mode 100644 index 0000000..a7aa345 --- /dev/null +++ b/tools/ci/samples/test7.h @@ -0,0 +1,16 @@ +#ifndef TEST7 +#define TEST7 + +int function1(); + +#ifndef QQQ +#include "include1.h" +#else // QQQ +#include "include2.h" +#endif // QQQ + +#ifdef QQQ +#include "include3.h" +#endif // QQQ + +#endif // TEST7 \ No newline at end of file -- cgit v1.2.3-70-g09d2