Merge pull request #268 from autopulated/master

fix handling of nested subirectories in test directory; add test for that

Author: autopulated

yotta/lib/cmakegen.py

@@ -411,7 +411,7 @@ def generateTestDirList(self, builddir, dirname, source_files, component, immedi
         for f in source_files:
             if f.lang in ('c', 'cpp', 'objc', 's'):
                 subrelpath = os.path.relpath(f.relpath, dirname)
-                subdir = os.path.split(subrelpath)[0]
+                subdir = fsutils.fullySplitPath(subrelpath)[0]
                 if subdir:
                     subdirs[subdir].append(f)
                 else:

yotta/test/cli/build.py

@@ -134,6 +134,43 @@
 '''
 }
 
+Test_Tests = {
+'module.json':'''{
+  "name": "test-tests",
+  "version": "0.0.0",
+  "description": "Test yotta's compilation of tests.",
+  "keywords": [],
+  "author": "James Crosby <james.crosby@arm.com>",
+  "licenses": [
+    {
+      "url": "https://spdx.org/licenses/Apache-2.0",
+      "type": "Apache-2.0"
+    }
+  ],
+  "dependencies": {},
+  "targetDependencies": {}
+}''',
+'source/foo.c':'''#include "stdio.h"
+int foo(){
+    printf("foo!\\n");
+    return 7;
+}''',
+'test-tests/foo.h':'int foo();',
+'test/a/bar.c':'#include "test-tests/foo.h"\nint main(){ foo(); return 0; }',
+'test/b/a/bar.c':'#include "test-tests/foo.h"\nint bar(); int main(){ foo(); bar(); return 0; }',
+'test/b/b/bar.c':'#include "stdio.h"\nint bar(){ printf("bar!\\n"); return 7; }',
+'test/c/a/a/bar.c':'#include "test-tests/foo.h"\nint bar(); int main(){ foo(); bar(); return 0; }',
+'test/c/b/a/bar.c':'#include "stdio.h"\nint bar(){ printf("bar!\\n"); return 7; }',
+'test/d/a/a/bar.c':'#include "test-tests/foo.h"\nint bar(); int main(){ foo(); bar(); return 0; }',
+'test/d/a/b/bar.c':'#include "stdio.h"\nint bar(){ printf("bar!\\n"); return 7; }',
+'test/e/a/a/a/bar.c':'#include "test-tests/foo.h"\nint bar(); int main(){ foo(); bar(); return 0; }',
+'test/e/b/a/a/bar.c':'#include "stdio.h"\nint bar(){ printf("bar!\\n"); return 7; }',
+'test/f/a/a/a/bar.c':'#include "test-tests/foo.h"\nint bar(); int main(){ foo(); bar(); return 0; }',
+'test/f/a/b/a/bar.c':'#include "stdio.h"\nint bar(){ printf("bar!\\n"); return 7; }',
+'test/g/a/a/a/bar.c':'#include "test-tests/foo.h"\nint bar(); int main(){ foo(); bar(); return 0; }',
+'test/g/a/a/b/bar.c':'#include "stdio.h"\nint bar(){ printf("bar!\\n"); return 7; }'
+}
+
 def isWindows():
     # can't run tests that hit github without an authn token
     return os.name == 'nt'
@@ -171,20 +208,33 @@ def test_buildTrivialExe(self):
         rmRf(test_dir)
 
     @unittest.skipIf(isWindows(), "can't build natively on windows yet")
-    def test_buildZComplex(self):
+    def test_buildComplex(self):
         test_dir = self.writeTestFiles(Test_Complex)
 
         stdout = self.runCheckCommand(['--target', systemDefaultTarget(), 'build'], test_dir)
 
         rmRf(test_dir)
 
     @unittest.skipIf(isWindows(), "can't build natively on windows yet")
-    def test_buildZZComplexSpaceInPath(self):
+    def test_buildComplexSpaceInPath(self):
         test_dir = self.writeTestFiles(Test_Complex, True)
 
         stdout = self.runCheckCommand(['--target', systemDefaultTarget(), 'build'], test_dir)
 
         rmRf(test_dir)
+    
+    @unittest.skipIf(isWindows(), "can't build natively on windows yet")
+    def test_buildTests(self):
+        test_dir = self.writeTestFiles(Test_Tests, True)
+        stdout = self.runCheckCommand(['--target', systemDefaultTarget(), 'build'], test_dir)
+        stdout = self.runCheckCommand(['--target', systemDefaultTarget(), 'test'], test_dir)
+        self.assertIn('test-a', stdout)
+        self.assertIn('test-c', stdout)
+        self.assertIn('test-d', stdout)
+        self.assertIn('test-e', stdout)
+        self.assertIn('test-f', stdout)
+        self.assertIn('test-g', stdout)
+        rmRf(test_dir)
 
 
     def runCheckCommand(self, args, test_dir):