Self-review

testsuite/README.md

@@ -38,6 +38,6 @@ $ ./run.py
 # Creating tests
 All tests are based on running a Python script. There are three test drivers:
 
-- `python-script`: run in host in sandboxed build mode
-- `shared-build`: run in host in shared build mode
-- `docker-wrapper`: run in a pristine docker Ubuntu image in shared build mode
+- `python-script`: run in host in both sandboxed and shared build mode.
+    - The build mode can be narrowed down with the `build_mode` attribute.
+- `docker-wrapper`: run in a pristine docker Ubuntu image in shared build mode.

testsuite/drivers/driver/python_script.py

@@ -95,6 +95,14 @@ def restore_working_dir(self):
         # Restore the working directory to its initial state, by deleting
         # everything and copying originals back from .orig dir
 
+        def make_writable(path):
+            # Make everything inside a directory writable recursively
+            for root, dirs, files in os.walk(path):
+                for d in dirs:
+                    os.chmod(os.path.join(root, d), 0o777)
+                for f in files:
+                    os.chmod(os.path.join(root, f), 0o666)
+
         base = self.test_env['working_dir']
         orig_name = ".orig"
 
@@ -105,6 +113,8 @@ def restore_working_dir(self):
                 if os.path.isfile(path):
                     os.remove(path)
                 else:
+                    # Git marks some files read-only, so make them writable
+                    make_writable(path)
                     shutil.rmtree(path)
 
         # Restore the original files

testsuite/run.py

@@ -17,16 +17,14 @@
 import e3.testsuite.driver
 from drivers.driver.docker_wrapper import DockerWrapperDriver
 from drivers.driver.python_script import PythonScriptDriver
-from drivers.driver.shared_build import SharedBuildDriver
 from drivers.helpers import on_windows
 
 
 class Testsuite(e3.testsuite.Testsuite):
     tests_subdir = 'tests'
     test_driver_map = {
         'python-script': PythonScriptDriver,
-        'docker-wrapper': DockerWrapperDriver,
-        'shared-build': SharedBuildDriver
+        'docker-wrapper': DockerWrapperDriver
         }
 
     def add_options(self, parser):

testsuite/tests/build/hashes/compiler-input/test.yaml

@@ -1,4 +1,5 @@
-driver: shared-build
+driver: python-script
+build_mode: shared
 indexes:
     toolchain_index:
         in_fixtures: true

testsuite/tests/build/hashes/compiler-missing/test.yaml

@@ -1,3 +1,4 @@
-driver: shared-build
+driver: python-script
+build_mode: shared
 indexes:
     basic_no_compiler_index: {}

testsuite/tests/build/hashes/config-types/test.yaml

@@ -1,3 +1,4 @@
-driver: shared-build
+driver: python-script
+build_mode: shared
 indexes:
     build_hash_index: {}

testsuite/tests/build/hashes/hashing-inputs/test.yaml

@@ -1,3 +1,4 @@
-driver: shared-build
+driver: python-script
+build_mode: shared
 indexes:
     build_hash_index: {}

testsuite/tests/build/hashes/incomplete-config/test.yaml

@@ -1,3 +1,4 @@
-driver: shared-build
+driver: python-script
+build_mode: shared
 indexes:
     build_hash_index: {}

testsuite/tests/config/shared-deps/test.yaml

@@ -1,3 +1,4 @@
-driver: shared-build
+driver: python-script
+build_mode: shared
 indexes:
     build_hash_index: {}

testsuite/tests/solver/compiler-installed/test.yaml

@@ -1,7 +1,4 @@
 driver: python-script
-build_mode: sandboxed
-# This test can't be run twice as it alters the environment in ways too complex
-# to restore to the initial status. Instead we use a separate copy of the test.
 indexes:
     toolchain_index:
         in_fixtures: true