From b9dbeb2c2a136fe88db5fa41e15a8b44866854ce Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 11 Jun 2016 20:21:00 +0300
Subject: Add more ci tests. Fix old tests.

---
 .gitlab-ci.yml              | 22 ++++++++++++++++++++--
 tools/ci/samples/include2.h |  6 ++++++
 tools/ci/samples/include3.h |  6 ++++++
 tools/ci/samples/test3.h    |  6 +++---
 tools/ci/samples/test4.cpp  | 11 +++++++++++
 tools/ci/samples/test4.h    |  6 ++++++
 tools/ci/samples/test5.h    |  8 ++++++++
 7 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 tools/ci/samples/include2.h
 create mode 100644 tools/ci/samples/include3.h
 create mode 100644 tools/ci/samples/test4.cpp
 create mode 100644 tools/ci/samples/test4.h
 create mode 100644 tools/ci/samples/test5.h

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4494682..21fd3b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ test2_cpp:
   stage: build
   script:
   - ./tools/ci/jobs/deheader.sh "g++-5" test2.cpp
-  - ./tools/ci/jobs/deheadererror.sh
+  - ./tools/ci/jobs/deheadererror.sh "include1.h"
   image: debian:unstable
   tags:
     - docker
@@ -38,11 +38,29 @@ test2_cpp:
   stage: build
   script:
   - ./tools/ci/jobs/deheader.sh "g++-5" test3.cpp
-  - ./tools/ci/jobs/deheadererror.sh
+  - ./tools/ci/jobs/deheadererror.sh "include1.h"
   image: debian:unstable
   tags:
     - docker
 
+test4_cpp:
+  stage: build
+  script:
+  - ./tools/ci/jobs/deheader.sh "g++-5" test4.cpp
+  - ./tools/ci/jobs/deheadererror.sh "include1.h"
+  - ./tools/ci/jobs/deheadererror.sh "include2.h"
+  image: debian:unstable
+  tags:
+    - docker
+
+test5_h:
+  stage: build
+  script:
+  - ./tools/ci/jobs/deheader.sh "g++-5" test5.h
+  - ./tools/ci/jobs/deheadererror.sh "include1.h"
+  image: debian:unstable
+  tags:
+    - docker
 
 # reports
 
diff --git a/tools/ci/samples/include2.h b/tools/ci/samples/include2.h
new file mode 100644
index 0000000..f0edb51
--- /dev/null
+++ b/tools/ci/samples/include2.h
@@ -0,0 +1,6 @@
+#ifndef INCLUDE2
+#define INCLUDE2
+
+void function2();
+
+#endif  // INCLUDE2
\ No newline at end of file
diff --git a/tools/ci/samples/include3.h b/tools/ci/samples/include3.h
new file mode 100644
index 0000000..fdc006e
--- /dev/null
+++ b/tools/ci/samples/include3.h
@@ -0,0 +1,6 @@
+#ifndef INCLUDE3
+#define INCLUDE3
+
+void function3();
+
+#endif  // INCLUDE3
\ No newline at end of file
diff --git a/tools/ci/samples/test3.h b/tools/ci/samples/test3.h
index 4cc2335..7f2669e 100644
--- a/tools/ci/samples/test3.h
+++ b/tools/ci/samples/test3.h
@@ -1,6 +1,6 @@
-#ifndef TEST2
-#define TEST2
+#ifndef TEST3
+#define TEST3
 
 int function1();
 
-#endif  // TEST2
\ No newline at end of file
+#endif  // TEST3
\ No newline at end of file
diff --git a/tools/ci/samples/test4.cpp b/tools/ci/samples/test4.cpp
new file mode 100644
index 0000000..340fdda
--- /dev/null
+++ b/tools/ci/samples/test4.cpp
@@ -0,0 +1,11 @@
+#include "test4.h"
+
+#include "include1.h"
+
+int function1()
+{
+    return 0;
+}
+
+#include "include2.h"
+
diff --git a/tools/ci/samples/test4.h b/tools/ci/samples/test4.h
new file mode 100644
index 0000000..f578ad2
--- /dev/null
+++ b/tools/ci/samples/test4.h
@@ -0,0 +1,6 @@
+#ifndef TEST4
+#define TEST4
+
+int function1();
+
+#endif  // TEST4
\ No newline at end of file
diff --git a/tools/ci/samples/test5.h b/tools/ci/samples/test5.h
new file mode 100644
index 0000000..d7b9143
--- /dev/null
+++ b/tools/ci/samples/test5.h
@@ -0,0 +1,8 @@
+#ifndef TEST5
+#define TEST5
+
+#include "include1.h"
+
+int function1();
+
+#endif  // TEST5
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2