Avoid triggering latent bug in deinstrumentation method (#184)

* implemented time limit in commands

* bug fix: moved time_limit to simple test suite

* added time limits to test execution

* version bump

* fixed sed command and remove gcovr installation

* avoid deinstrument method

* tweaked compiler commands

* bumped version to 2.0.12

bugzoo/compiler/__init__.py

@@ -205,10 +205,10 @@ def from_dict(d: dict) -> 'WafCompiler':
         return WafCompiler(d['time-limit'])
 
     def __init__(self, time_limit: float) -> None:
-        cmd = "./waf build -j$(nproc)"
-        cxxflags = "--coverage -Wno-error=maybe-uninitialized -save-temps=obj"
-        ldflags = "--coverage"
-        cmdi = "./waf configure LDFLAGS='{}' CXXFLAGS='{}'; {}".format(ldflags,
+        cmd = './waf build -j$(nproc)'
+        cxxflags = '--coverage -Wno-error=maybe-uninitialized -save-temps=obj'
+        ldflags = '--coverage'
+        cmdi = './waf configure LDFLAGS="{}" CXXFLAGS="{}"; {}'.format(ldflags,
                                                                        cxxflags,
                                                                        cmd)
         super().__init__(command=cmd,
@@ -227,7 +227,7 @@ def __init__(self, time_limit: float) -> None:
         cmd = 'make -j$(nproc)'
         cflags = "--coverage" # save-temps=obj"
         ldflags = "--coverage"
-        flags = "LDFLAGS='{}' CXXFLAGS='{}' CFLAGS='{}'"
+        flags = 'LDFLAGS="{}" CXXFLAGS="{}" CFLAGS="{}"'
         flags = flags.format(ldflags, cflags, cflags)
         cmdi = "make clean; ./configure {}; {}".format(flags, cmd)
 

bugzoo/mgr/coverage.py

@@ -146,8 +146,9 @@ def coverage(self,
                                      instrumented_files=files_to_instrument)
             cov[test.name] = TestCoverage(test.name, outcome, filelines)
 
-        self.deinstrument(container,
-                          instrumented_files=files_to_instrument)
+        # FIXME deinstrument
+        # self.deinstrument(container,
+        #                   instrumented_files=files_to_instrument)
 
         return TestSuiteCoverage(cov)
 
@@ -180,8 +181,8 @@ def instrument(self,
 
         # ensure that gcovr is mounted within the container
         # TODO: mount binaries
-        mgr_ctr.command(container,
-                        'sudo apt-get update && sudo apt-get install -y gcovr')
+        # mgr_ctr.command(container,
+        #                 'sudo apt-get update && sudo apt-get install -y gcovr')
 
         # add instrumentation to each file
         dir_source = bug.source_dir
@@ -215,6 +216,8 @@ def deinstrument(self,
         Strips instrumentation from the source code inside a given container,
         and reconfigures its program to no longer use coverage options.
         """
+        raise Exception("contains bug in sed command -- avoid use for now.")
+
         mgr_ctr = self.__installation.containers
         mgr_bug = self.__installation.bugs
         bug = mgr_bug[container.bug]
@@ -225,8 +228,8 @@ def deinstrument(self,
 
         # remove source code instrumentation
         for fn_instrumented in instrumented_files:
-            cmd = "sed -i '1,{}d' '{}'"
-            cmd.format(num_lines_to_remove, fn_instrumented)
+            cmd = 'sed -i "1,{}d" "{}"'
+            cmd = cmd.format(num_lines_to_remove, fn_instrumented)
             mgr_ctr.command(container, cmd)
 
         # TODO recompile with standard flags

bugzoo/version.py

@@ -1 +1 @@
-__version__ = '2.0.11'
+__version__ = '2.0.12'