Merge lp:~allanlesage/coverage-builder/qmake-test into lp:coverage-builder

[Allan LeSage]

Add a minimal qmake test; note that once we have .gcnos we're all set, and all the same further diversions (dh_auto_test, e.g.) will be the same--this test just ensures that we can get .gcnos from the same minimal fibonacci codebase.

[Martin Pitt (pitti)]

LGTM, except for the debian package name of the test project (similar to the other MP).

review: Approve

=== added directory 'test/qmake-project'
=== added file 'test/qmake-project/coverage.pri'
--- test/qmake-project/coverage.pri	1970-01-01 00:00:00 +0000
+++ test/qmake-project/coverage.pri	2014-09-17 05:43:33 +0000
@@ -0,0 +1,45 @@
+# Coverage
+CONFIG(coverage) {
+    LIBS += -lgcov
+    QMAKE_CXXFLAGS += --coverage
+    QMAKE_LDFLAGS += --coverage
+
+    QMAKE_EXTRA_TARGETS += coverage cov
+    QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
+        generate-coverage-html clean-coverage-html coverage-gcovr \
+        generate-gcovr generate-coverage-gcovr clean-coverage-gcovr
+
+    clean-gcno.commands = \
+        "@echo Removing old coverage instrumentation"; \
+        "find -name '*.gcno' -print | xargs -r rm"
+
+    clean-gcda.commands = \
+        "@echo Removing old coverage results"; \
+        "find -name '*.gcda' -print | xargs -r rm"
+  
+    coverage-html.depends = clean-gcda check generate-coverage-html
+  
+    generate-coverage-html.commands = \
+        "@echo Collecting coverage data"; \
+        "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
+        "lcov --extract coverage.info \"*/src/*.cpp\" -o coverage.info"; \
+        "lcov --remove coverage.info \"moc_*.cpp\" -o coverage.info"; \
+        "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
+  
+    clean-coverage-html.depends = clean-gcda
+    clean-coverage-html.commands = \
+        "lcov --directory $${TOP_SRC_DIR} -z"; \
+        "rm -rf coverage.info coverage-html"
+
+    coverage-gcovr.depends = clean-gcda check generate-coverage-gcovr
+
+    generate-coverage-gcovr.commands = \
+        "@echo Generating coverage GCOVR report"; \
+        "gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"tests/.*\" -e \".*\\.h\""
+
+    clean-coverage-gcovr.depends = clean-gcda
+    clean-coverage-gcovr.commands = \
+        "rm -rf $${TOP_SRC_DIR}/coverage.xml"
+
+    QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
+}

=== added directory 'test/qmake-project/debian'
=== added file 'test/qmake-project/debian/changelog'
--- test/qmake-project/debian/changelog	1970-01-01 00:00:00 +0000
+++ test/qmake-project/debian/changelog	2014-09-17 05:43:33 +0000
@@ -0,0 +1,5 @@
+dummy-coverage-mangler (1.0) UNRELEASED; urgency=medium
+
+  * Initial release.
+
+ -- Pep Peroni <[e-mail]>  Sun, 24 Aug 2014 20:54:32 -0500

=== added file 'test/qmake-project/debian/control'
--- test/qmake-project/debian/control	1970-01-01 00:00:00 +0000
+++ test/qmake-project/debian/control	2014-09-17 05:43:33 +0000
@@ -0,0 +1,12 @@
+Source: dummy-coverage-mangler
+Maintainer: Al Fresco <[e-mail]>
+Section: misc
+Priority: optional
+Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9)
+
+Package: dummy-coverage-mangler
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Say hello world
+ Say "Hello world!" and exit!

=== added file 'test/qmake-project/debian/copyright'
=== added file 'test/qmake-project/debian/rules'
--- test/qmake-project/debian/rules	1970-01-01 00:00:00 +0000
+++ test/qmake-project/debian/rules	2014-09-17 05:43:33 +0000
@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+%:
+	dh $@

=== added file 'test/qmake-project/fibonacci.cpp'
--- test/qmake-project/fibonacci.cpp	1970-01-01 00:00:00 +0000
+++ test/qmake-project/fibonacci.cpp	2014-09-17 05:43:33 +0000
@@ -0,0 +1,11 @@
+
+#include "fibonacci.h"
+
+int fib(int x)
+{
+  if (x == 0)
+    return 0;
+  if (x == 1)
+    return 1;
+  return fib(x-1) + fib(x-2);
+}

=== added file 'test/qmake-project/fibonacci.h'
--- test/qmake-project/fibonacci.h	1970-01-01 00:00:00 +0000
+++ test/qmake-project/fibonacci.h	2014-09-17 05:43:33 +0000
@@ -0,0 +1,7 @@
+
+#ifndef _FIBONACCI_H
+#define _FIBONACCI_H
+
+int fib(int x);
+
+#endif

=== added file 'test/qmake-project/fibonacci.pro'
--- test/qmake-project/fibonacci.pro	1970-01-01 00:00:00 +0000
+++ test/qmake-project/fibonacci.pro	2014-09-17 05:43:33 +0000
@@ -0,0 +1,9 @@
+include(coverage.pri)
+TARGET = fibonacci
+CONFIG += coverage
+TEMPLATE = subdirs
+SUBDIRS = gtest \
+    tests
+SOURCES = main.cpp \
+    fibonacci.cpp
+HEADERS = fibonacci.h

=== added directory 'test/qmake-project/gtest'
=== added file 'test/qmake-project/gtest/gtest.pro'
--- test/qmake-project/gtest/gtest.pro	1970-01-01 00:00:00 +0000
+++ test/qmake-project/gtest/gtest.pro	2014-09-17 05:43:33 +0000
@@ -0,0 +1,32 @@
+
+TEMPLATE = lib
+CONFIG += static
+TARGET = gtest
+
+INCLUDEPATH += /usr/src/gtest
+
+HEADERS = /usr/include/gtest/*.h
+SOURCES = /usr/src/gtest/src/gtest-all.cc
+
+# culled from Googling
+#INCLUDEPATH += ../path/to/gtest/includes
+#LIBS += -L../path/to/gtest/libraries -lgtest
+
+# this is what we do in CMake
+## Check for google test and build it locally
+#set(
+#  GTEST_ROOT_DIR
+#  "/usr/src/gtest" # Default value, adjustable by user with e.g., ccmake
+#  CACHE
+#  PATH
+#  "Path to Google test srcs"
+#)
+#
+#find_path(GTEST_INCLUDE_DIR gtest/gtest.h)
+#if (GTEST_INCLUDE_DIR)
+#  #FIXME - hardcoded is bad!
+#  add_subdirectory(
+#    ${GTEST_ROOT_DIR}
+#    gtest
+#  )
+#endif(GTEST_INCLUDE_DIR)

=== added file 'test/qmake-project/main.cpp'
--- test/qmake-project/main.cpp	1970-01-01 00:00:00 +0000
+++ test/qmake-project/main.cpp	2014-09-17 05:43:33 +0000
@@ -0,0 +1,9 @@
+#include <iostream>
+#include "fibonacci.h"
+
+int main ()
+{
+  std::cout << "Hello world!" << std::endl;
+  int x = fib(2);
+  return x;
+}

=== added directory 'test/qmake-project/tests'
=== added file 'test/qmake-project/tests/fibonacci-test.pro'
--- test/qmake-project/tests/fibonacci-test.pro	1970-01-01 00:00:00 +0000
+++ test/qmake-project/tests/fibonacci-test.pro	2014-09-17 05:43:33 +0000
@@ -0,0 +1,11 @@
+
+SOURCES = test_main.cpp \
+  test_fibonacci.cpp
+  ../fibonacci.cpp
+
+HEADERS = ../fibonacci.h
+
+INCLUDEPATH += \
+    $${TOP_SRC_DIR}
+
+QMAKE_EXTRA_TARGETS += check

=== added file 'test/qmake-project/tests/test_fibonacci.cpp'
--- test/qmake-project/tests/test_fibonacci.cpp	1970-01-01 00:00:00 +0000
+++ test/qmake-project/tests/test_fibonacci.cpp	2014-09-17 05:43:33 +0000
@@ -0,0 +1,22 @@
+
+
+#include "gtest/gtest.h"
+
+#include "fibonacci.h"
+
+
+TEST(FibonacciTest, FirstTermIsCorrect) {
+  EXPECT_EQ(0, fib(0));
+}
+
+TEST(FibonacciTest, SecondTermIsCorrect) {
+  EXPECT_EQ(1, fib(1));
+}
+
+TEST(FibonacciTest, ThirdTermIsCorrect) {
+  EXPECT_EQ(1, fib(2));
+}
+
+TEST(FibonacciTest, FourthTermIsCorrect) {
+  EXPECT_EQ(2, fib(3));
+}

=== added file 'test/qmake-project/tests/test_main.cpp'
--- test/qmake-project/tests/test_main.cpp	1970-01-01 00:00:00 +0000
+++ test/qmake-project/tests/test_main.cpp	2014-09-17 05:43:33 +0000
@@ -0,0 +1,8 @@
+
+#include "gtest/gtest.h"
+
+int main(int argc, char** argv)
+{
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}

=== added file 'test/qmake-project/tests/tests.pro'
--- test/qmake-project/tests/tests.pro	1970-01-01 00:00:00 +0000
+++ test/qmake-project/tests/tests.pro	2014-09-17 05:43:33 +0000
@@ -0,0 +1,9 @@
+include(../coverage.pri)
+TARGET = tests
+CONFIG += testcase
+SOURCES = test_main.cpp \
+    test_fibonacci.cpp \
+    ../fibonacci.cpp
+HEADERS = ../fibonacci.h
+INCLUDEPATH += ..
+LIBS += -L../gtest -lgtest

=== added file 'test/test_qmake.py'
--- test/test_qmake.py	1970-01-01 00:00:00 +0000
+++ test/test_qmake.py	2014-09-17 05:43:33 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/python3
+# coverage-builder tests
+# (C) 2014 Canonical Ltd.
+# Author: Allan LeSage <[e-mail]>
+# License: GPL 3 or later
+
+from test import CoverageBuilderTestCase
+
+
+class QmakeBuildTestCase(CoverageBuilderTestCase):
+
+    def setUp(self):
+        super(QmakeBuildTestCase, self).setUp()
+        self._copy_dummy_project_into_place('qmake-project')
+
+    def test_gcnos_appear(self):
+        """dh_auto_build makes .gcno files appear.
+
+        qmake is relatively tight-lipped with no configure feedback;
+        just make sure that we get gcnos on build.
+        """
+        self._call_dh_auto_configure()
+        out, err = self._call_dh_auto_build()
+        self.assertTrue(self._find_gcno())