Updated test helpers to force a cpu-benchmark rebuild,

via an ugly in-place rewrite of setup.py

Author: henricasanova

tests/test_helpers.py

@@ -42,13 +42,15 @@ def _install_WfCommons_on_container(container):
     # Cleanup files from the host
     exit_code, output = container.exec_run("sudo /bin/rm -rf /tmp/WfCommons/build/", stdout=True, stderr=True)
     exit_code, output = container.exec_run("sudo /bin/rm -rf /tmp/WfCommons/*.egg-info/", stdout=True, stderr=True)
+    # Clean up and force a rebuild of cpu-benchmark (because it may be compiled for the wrong architecture)
     exit_code, output = container.exec_run("sudo /bin/rm -rf /tmp/WfCommons/bin/cpu-benchmark.o", stdout=True,
                                            stderr=True)
     exit_code, output = container.exec_run("sudo /bin/rm -rf /tmp/WfCommons/bin/cpu-benchmark", stdout=True,
                                            stderr=True)
+    exit_code, output = container.exec_run(r"sudo sed -i 's|if os.path.exists(cpu_benchmark_path):|if True:|' /tmp/WfCommons/setup.py")
 
     # Install WfCommons on the container (to install wfbench and cpu-benchmark really)
-    exit_code, output = container.exec_run("sudo python3 -m pip install . --break-system-packages",
+    exit_code, output = container.exec_run("sudo python3 -m pip install -v . --break-system-packages",
                                            workdir="/tmp/WfCommons", stdout=True, stderr=True)
     if exit_code != 0:
         raise RuntimeError("Failed to install WfCommons on the container")
@@ -88,6 +90,7 @@ def _start_docker_container(backend, mounted_dir, working_dir, bin_dir, command=
                                                stdout=True, stderr=True)
         if exit_code != 0:
             raise RuntimeError("Failed to copy wfbench script to the bin directory")
+
         exit_code, output = container.exec_run(["sh", "-c", "sudo cp -f `which cpu-benchmark` " + bin_dir],
                                                stdout=True, stderr=True)
         if exit_code != 0: