Try to fix tests for Windows

tests/conftest.py

@@ -13,6 +13,12 @@
     )
 except FileExistsError:
     pass
+except OSError:
+    import shutil
+    shutil.copytree(
+        root / '00-upstream',
+        root / '02-add-subdirectory/external/00-upstream',
+    )
 
 GENERATOR = [
     x.strip() for x in
@@ -80,13 +86,17 @@ def install(self, params, source_dir):
                 },
                 check=True
             )
-            yield build_dir
+            yield (source_dir, build_dir)
 
-    def test(self, build_dir, source_dir):
+    def test(self, params, source_dir, build_dir):
         subprocess.run(
             ['make', 'test'],
             cwd=root / source_dir,
-            env={ **os.environ, 'build_dir': build_dir },
+            env={
+                **os.environ,
+                'build_dir': build_dir,
+                'flavor': CMAKE_FLAVORS[params['flavor']],
+            },
             check=True,
         )
 
@@ -104,7 +114,7 @@ def install(self, params, source_dir):
             ], check=True)
             yield build_dir
 
-    def test(self, build_dir, source_dir):
+    def test(self, params, source_dir, build_dir):
         subprocess.run([
             'cupcake', 'test',
             '--source-dir', root / source_dir,

tests/test_add_subdirectory.py

@@ -1,5 +1,5 @@
-def test_two(builder, two):
-    builder.test(two, '02-add-subdirectory')
+def test_two(params, builder, two):
+    builder.test(params, *two)
 
-def test_four(builder, four):
-    builder.test(four, '04-as-fp')
+def test_four(params, builder, four):
+    builder.test(params, *four)

tests/test_fetch_content.py

@@ -1,2 +1,2 @@
-def test_five(builder, five):
-    builder.test(five, '05-fetch-content')
+def test_five(params, builder, five):
+    builder.test(params, *five)

tests/test_pcf.py

@@ -1,8 +1,8 @@
-def test_zero(builder, zero):
-    builder.test(zero, '00-upstream')
+def test_zero(params, builder, zero):
+    builder.test(params, *zero)
 
-def test_one(builder, one):
-    builder.test(one, '01-find-package')
+def test_one(params, builder, one):
+    builder.test(params, *one)
 
-def test_three(builder, three):
-    builder.test(three, '03-fp-fp')
+def test_three(params, builder, three):
+    builder.test(params, *three)

tests/test_requires_nothing.py

@@ -1,8 +1,8 @@
-def test_seven(builder, seven):
-    builder.test(seven, '07-as-fc')
+def test_seven(params, builder, seven):
+    builder.test(params, *seven)
 
-def test_nine(builder, nine):
-    builder.test(nine, '09-external-project')
+def test_nine(params, builder, nine):
+    builder.test(params, *nine)
 
-def test_ten(builder, ten):
-    builder.test(ten, '10-conan')
+def test_ten(params, builder, ten):
+    builder.test(params, *ten)

tests/test_requires_zero.py

@@ -1,8 +1,8 @@
-def test_six(builder, six):
-    builder.test(six, '06-fp-fc')
+def test_six(params, builder, six):
+    builder.test(params, *six)
 
-def test_eight(builder, eight):
-    builder.test(eight, '08-find-module')
+def test_eight(params, builder, eight):
+    builder.test(params, *eight)
 
-def test_eleven(builder, eleven):
-    builder.test(eleven, '11-no-cupcake')
+def test_eleven(params, builder, eleven):
+    builder.test(params, *eleven)