diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-06-12 18:06:13 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-06-12 18:17:22 +0300 |
commit | dff67d602e6ae72fd8e8865eb2343e9db922578d (patch) | |
tree | c91c89249ce04280913cb9d45d0aea0f64faaead | |
parent | 522b2233b00cd8728d4c933d2468b15e3a103179 (diff) | |
download | deheader-dff67d602e6ae72fd8e8865eb2343e9db922578d.tar.gz deheader-dff67d602e6ae72fd8e8865eb2343e9db922578d.tar.bz2 deheader-dff67d602e6ae72fd8e8865eb2343e9db922578d.tar.xz deheader-dff67d602e6ae72fd8e8865eb2343e9db922578d.zip |
Add some more advanced tests.
-rw-r--r-- | .gitlab-ci.yml | 38 | ||||
-rw-r--r-- | tools/ci/samples/include4.h | 6 | ||||
-rw-r--r-- | tools/ci/samples/test8.cpp | 18 | ||||
-rw-r--r-- | tools/ci/samples/test8.h | 20 | ||||
-rw-r--r-- | tools/ci/samples/test9.cpp | 12 | ||||
-rw-r--r-- | tools/ci/samples/test9.h | 11 |
6 files changed, 105 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 584a494..031df72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,6 +108,44 @@ test7_h: tags: - docker +test8_cpp: + stage: build + script: + - ./tools/ci/jobs/deheader.sh "g++-5" "-DQQQ" test8.cpp + - ./tools/ci/jobs/deheadererror.sh "include2.h" + - ./tools/ci/jobs/deheadererror.sh "include3.h" + image: debian:unstable + tags: + - docker + +test8_h: + stage: build + script: + - ./tools/ci/jobs/deheader.sh "g++-5" "-DQQQ" test8.h + - ./tools/ci/jobs/deheadererror.sh "include2.h" + - ./tools/ci/jobs/deheadererror.sh "include3.h" + image: debian:unstable + tags: + - docker + +test9_cpp: + stage: build + script: + - ./tools/ci/jobs/deheader.sh "g++-5" "" test9.cpp + - ./tools/ci/jobs/deheadererror.sh "include3.h" + image: debian:unstable + tags: + - docker + +test9_h: + stage: build + script: + - ./tools/ci/jobs/deheader.sh "g++-5" "" test9.h + - ./tools/ci/jobs/deheadererror.sh "include2.h" + image: debian:unstable + tags: + - docker + # reports success: diff --git a/tools/ci/samples/include4.h b/tools/ci/samples/include4.h new file mode 100644 index 0000000..49309dd --- /dev/null +++ b/tools/ci/samples/include4.h @@ -0,0 +1,6 @@ +#ifndef INCLUDE4 +#define INCLUDE4 + +void function4(); + +#endif // INCLUDE4
\ No newline at end of file diff --git a/tools/ci/samples/test8.cpp b/tools/ci/samples/test8.cpp new file mode 100644 index 0000000..5089561 --- /dev/null +++ b/tools/ci/samples/test8.cpp @@ -0,0 +1,18 @@ +#include "test8.h" + +#if !defined(ZZZ) +#ifndef QQQ +#include "include1.h" +#else // QQQ +#include "include2.h" +#endif // QQQ +#endif // !defined(ZZZ) + +int function1() +{ + return 0; +} + +#if defined(QQQ) +#include "include3.h" +#endif // defined(QQQ) diff --git a/tools/ci/samples/test8.h b/tools/ci/samples/test8.h new file mode 100644 index 0000000..c35f6f6 --- /dev/null +++ b/tools/ci/samples/test8.h @@ -0,0 +1,20 @@ +#ifndef TEST8 +#define TEST8 + +int function1(); + +#if !defined(ZZZ) +#ifndef QQQ +#include "include1.h" +#else // QQQ +#include "include2.h" +#endif // QQQ +#else // !defined(ZZZ) +#include "include4.h" +#endif // !defined(ZZZ) + +#if defined(QQQ) +#include "include3.h" +#endif // defined(QQQ) + +#endif // TEST8
\ No newline at end of file diff --git a/tools/ci/samples/test9.cpp b/tools/ci/samples/test9.cpp new file mode 100644 index 0000000..57b2279 --- /dev/null +++ b/tools/ci/samples/test9.cpp @@ -0,0 +1,12 @@ +#include "test9.h" + +#ifndef QQQ +#include "include1.h" +#else +#include "include3.h" +#endif // QQQ + +int function1() +{ + return 0; +} diff --git a/tools/ci/samples/test9.h b/tools/ci/samples/test9.h new file mode 100644 index 0000000..329c2ea --- /dev/null +++ b/tools/ci/samples/test9.h @@ -0,0 +1,11 @@ +#ifndef TEST9 +#define TEST9 + +#ifndef QQQ +#include "include2.h" +#endif // QQQ + +int function1(); + +#define QQQ +#endif // TEST9 |