compiler options using '--'

Author: kris-jusiak

README.md

@@ -32,11 +32,16 @@ will create mocks files in current directory for all interfaces
 will create directory 'test/mocks' and mocks files within this directory for all interfaces (contains at least one pure virtual function)
 which will be within 'namespace::class' declaration
 
+```sh
+./gmock.py -d "test/mocks" file1.hpp file2.hpp -- -D LINUX -Iproject/externals
+```
+'--' separates arguments between gmock.py and compiler options
+
 ### Integration with the build system
 ```sh
 find project -iname "*.h" -or -iname "*.hpp" | xargs "project/externals/gmock.py"   \
     -c "project/conf/gmock.conf"                                                    \
-    -d "project/generated/mocks"                                                    \
+    -d "project/test/mocks"                                                         \
     -l "Project"
 ```
 
@@ -68,8 +73,8 @@ find project -iname "*.h" -or -iname "*.hpp" | xargs "project/externals/gmock.py
 # interface: interface class
 # mock_methods: generated gmock methods
 # generated_dir: generated directory
-# mock_file_hpp: mock header file 
-# mock_file_cpp: mock source file 
+# mock_file_hpp: mock header file
+# mock_file_cpp: mock source file
 
 mock_file_hpp = "%(interface)sMock.hpp"
 

gmock.py

@@ -227,7 +227,7 @@ def generate(self):
         return 0
 
 def main(args):
-    def parse(files):
+    def parse(files, args):
         def generate_includes(includes):
             result = []
             for include in includes:
@@ -236,12 +236,20 @@ def generate_includes(includes):
 
         return Index.create(excludeDecls = True).parse(
             path = "~.hpp"
+          , args = args
           , unsaved_files = [("~.hpp", generate_includes(files))]
           , options = TranslationUnit.PARSE_SKIP_FUNCTION_BODIES | TranslationUnit.PARSE_INCOMPLETE
         )
 
+    clang_args = None
+    args_split = [i for i, arg in enumerate(args) if arg == '--']
+    if args_split:
+        args, clang_args = args[:args_split[0]], args[args_split[0] + 1:]
+
+    default_config = os.path.dirname(args[0]) + "/gmock.conf"
+
     parser = OptionParser(usage="usage: %prog [options] files...")
-    parser.add_option("-c", "--config", dest="config", default=os.path.dirname(args[0]) + "/gmock.conf", help="config FILE (default='gmock.conf')", metavar="FILE")
+    parser.add_option("-c", "--config", dest="config", default=default_config, help="config FILE (default='gmock.conf')", metavar="FILE")
     parser.add_option("-d", "--dir", dest="path", default=".", help="dir for generated mocks (default='.')", metavar="DIR")
     parser.add_option("-l", "--limit", dest="decl", default="", help="limit to interfaces within declaration (default='')", metavar="LIMIT")
     (options, args) = parser.parse_args(args)
@@ -252,7 +260,7 @@ def generate_includes(includes):
     config = {}
     execfile(options.config, config)
     return mock_generator(
-        cursor = parse(files = args[1:]).cursor,
+        cursor = parse(files = args[1:], args = clang_args).cursor,
         decl = options.decl,
         path = options.path,
         mock_file_hpp = config['mock_file_hpp'],

test/given/I3I4.hpp

@@ -31,6 +31,14 @@ class I4
     virtual Enum f2()const = 0; // comment
 };
 
+#ifdef CLASS_I5
+class I5
+{
+public:
+    virtual void f0(void) = 0;
+};
+#endif
+
 } // namespace n1
 
 #endif

test/gmock_test.py

@@ -54,6 +54,14 @@ def test_gmock_many_files(self):
         self.assertTrue('I4Mock.hpp' in os.listdir(self.generated_dir))
         self.assertMocks();
 
+    def test_gmock_clang_args(self):
+        self.assertEqual(0, gmock.main(['../gmock.py', '-d', self.generated_dir, '-l', 'n1', 'given/I3I4.hpp', '--', '-D CLASS_I5']))
+        self.assertEqual(3, len([name for name in os.listdir(self.generated_dir)]))
+        self.assertTrue('I3Mock.hpp' in os.listdir(self.generated_dir))
+        self.assertTrue('I4Mock.hpp' in os.listdir(self.generated_dir))
+        self.assertTrue('I5Mock.hpp' in os.listdir(self.generated_dir))
+        self.assertMocks();
+
     def test_gmock_custom_conf(self):
         self.assertEqual(0, gmock.main(['../gmock.py', '-c', 'test.conf', '-d', self.generated_dir, '-l', 'n1', 'given/I2.hpp']))
         self.assertEqual(2, len([name for name in os.listdir(self.generated_dir)]))

test/then/I5Mock.hpp

@@ -0,0 +1,21 @@
+/*
+ * file generated by gmock: I5Mock.hpp
+ */
+#ifndef I5MOCK_HPP
+#define I5MOCK_HPP
+
+#include <gmock/gmock.h>
+#include "./given/I3I4.hpp"
+
+namespace n1 {
+
+class I5Mock : public I5
+{
+public:
+    MOCK_METHOD0(f0, void());
+};
+
+} // namespace n1
+
+#endif // I5MOCK_HPP
+