added more libraries to the mix

Change-Id: I64d913ca4a356a54053d6d1f81ced73b65f1e21c

Author: gizmomogwai

Rakefile.rb

@@ -2,11 +2,15 @@
             'cxxproject',
             'cxx',
             'cxxproject_gcctoolchain',
-            'cxxproject_clangtoolchain',
-            'cxxproject_clanganalyzer',
+#            'cxxproject_clangtoolchain',
+#            'cxxproject_rpitoolchain',
+#            'cxxproject_fsltoolchain',
+#            'cxxproject_clanganalyzer',
             'cxxproject_stats',
+            'cxxproject_tomake',
             'cxxproject_console',
-            'cxxproject_valgrind']
+            'cxxproject_valgrind',
+            'cxxproject_gcov']
 
 desc 'cleanup all built gems'
 task :clean do

basic/lib2/project.rb

@@ -9,7 +9,7 @@
     :sources => FileList['**/*.cpp'],
     :dependencies => deps,
     :includes => ['.'],
-    :whole_archive => true
+    :whole_archive => false
 
   unittest_flags = {
     :DEFINES => ['UNIT_TEST','CPPUNIT_MAIN="main"']

gtest/.gitignore

@@ -1 +1,2 @@
+*.gc??
 out

gtest/Rakefile.rb

@@ -1,3 +1,13 @@
 require 'cxx'
 
-cxx(Dir['**/project.rb'] , 'out', 'gcc', '.')
+flags = {
+  :FLAGS => ['-coverage']
+}
+
+cxx(Dir['**/project.rb'] , 'out', 'gcc', '.') do
+  Provider.modify_compiler("gcc", :C, flags)
+  Provider.modify_compiler("gcc", :CPP, flags)
+  Provider.modify_linker("gcc", flags)
+end
+
+

gtest/lib1/lib1.cpp

@@ -0,0 +1,9 @@
+#include "lib1.h"
+
+int Lib1::f1() {
+  return 1;
+}
+
+int Lib1::f2() {
+  return 2;
+}

gtest/lib1/lib1.h

@@ -0,0 +1,10 @@
+#ifndef lib1_h_
+#define lib1_h_
+
+class Lib1 {
+ public:
+  int f1();
+  int f2();
+};
+
+#endif

gtest/lib1/project.rb

@@ -0,0 +1,6 @@
+cxx_configuration do
+  source_lib 'lib1',
+    :sources => ['lib1.cpp'],
+    :includes => ['.']
+
+end

gtest/lib2/lib2.cpp

@@ -0,0 +1,16 @@
+#include "lib2.h"
+#include "lib1.h"
+
+int Lib2::f1() {
+  Lib1 l1;
+  return l1.f1() * 2;
+}
+
+int Lib2::f2() {
+  return 4;
+}
+
+int Lib2::f3() {
+  return 6;
+}
+

gtest/lib2/lib2.h

@@ -0,0 +1,12 @@
+#ifndef lib2_h_
+#define lib2_h_
+
+class Lib2 {
+
+ public:
+  int f1();
+  int f2();
+  int f3();
+};
+
+#endif

gtest/lib2/project.rb

@@ -0,0 +1,6 @@
+cxx_configuration do
+  source_lib 'lib2',
+    :sources => ['lib2.cpp'],
+    :dependencies => ['lib1'],
+    :includes => ['.']
+end

gtest/project.rb

@@ -1,12 +1,13 @@
 cxx_configuration do
   source_lib 'small-tests',
     :sources => ['small-tests.cpp'],
-    :dependencies => ['gtest'],
+    :dependencies => ['gtest', 'lib1'],
     :whole_archive => true
 
   source_lib 'small-tests2',
     :sources => ['small-tests2.cpp'],
-    :dependencies => ['gtest']
+    :dependencies => ['gtest', 'lib2'],
+    :whole_archive => true
 
   exe 'all-tests',
     :dependencies => ['small-tests', 'small-tests2', 'gtest_main']

gtest/small-tests.cpp

@@ -1,9 +1,22 @@
 #include <gtest/gtest.h>
 
+#include "lib1.h"
+
 TEST(Hello, world1) {
   EXPECT_EQ(1, 1);
 }
 
 TEST(Hello, world2) {
   EXPECT_EQ(1, 1);
 }
+
+TEST(Lib1, f1) {
+  Lib1 lib1;
+  EXPECT_EQ(1, lib1.f1());
+}
+
+TEST(Lib1, f2) {
+  Lib1 lib1;
+  EXPECT_EQ(2, lib1.f2());
+}
+

gtest/small-tests2.cpp

@@ -1,9 +1,16 @@
 #include <gtest/gtest.h>
 
+#include "lib2.h"
+
 TEST(Hello2, world1) {
   EXPECT_EQ(1, 1);
 }
 
 TEST(Hello2, world2) {
   EXPECT_TRUE(true);
 }
+
+TEST(Lib2, f1) {
+  Lib2 lib2;
+  EXPECT_EQ(2, lib2.f1());
+}