Fix m2crypto test and clean up formatting

Author: dwoz

relenv/build/linux.py

@@ -63,6 +63,7 @@ def populate_env(env, dirs):
         f"-I{dirs.prefix}/include/ncursesw",
         f"-I{dirs.toolchain}/{env['RELENV_HOST']}/sysroot/usr/include",
     ]
+    # env["CXXFLAGS"] = " ".join(cpplags)
     env["CPPFLAGS"] = " ".join(cpplags)
     env["PKG_CONFIG_PATH"] = f"{dirs.prefix}/lib/pkgconfig"
 
@@ -82,12 +83,12 @@ def build_bzip2(env, dirs, logfp):
         [
             "make",
             "-j8",
-            "PREFIX={}".format(dirs.prefix),
-            "LDFLAGS={}".format(env["LDFLAGS"]),
+            f"PREFIX={dirs.prefix}",
+            f"LDFLAGS={env['LDFLAGS']}",
             "CFLAGS=-fPIC",
-            "CC={}".format(env["CC"]),
-            "BUILD={}".format("x86_64-linux-gnu"),
-            "HOST={}".format(env["RELENV_HOST"]),
+            f"CC={env['CC']}",
+            "BUILD=x86_64-linux-gnu",
+            f"HOST={env['RELENV_HOST']}",
             "install",
         ],
         env=env,
@@ -99,10 +100,10 @@ def build_bzip2(env, dirs, logfp):
             "make",
             "-f",
             "Makefile-libbz2_so",
-            "CC={}".format(env["CC"]),
-            "LDFLAGS={}".format(env["LDFLAGS"]),
-            "BUILD={}".format("x86_64-linux-gnu"),
-            "HOST={}".format(env["RELENV_HOST"]),
+            f"CC={env['CC']}",
+            f"LDFLAGS={env['LDFLAGS']}",
+            "BUILD=x86_64-linux-gnu",
+            "HOST={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
@@ -125,10 +126,10 @@ def build_libxcrypt(env, dirs, logfp):
     runcmd(
         [
             "./configure",
-            "--prefix={}".format(dirs.prefix),
+            f"--prefix={dirs.prefix}",
             # "--enable-libgdbm-compat",
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            f"--build={env['RELENV_BUILD']}",
+            f"--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
@@ -152,10 +153,10 @@ def build_gdbm(env, dirs, logfp):
     runcmd(
         [
             "./configure",
-            "--prefix={}".format(dirs.prefix),
+            f"--prefix={dirs.prefix}",
             "--enable-libgdbm-compat",
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            f"--build={env['RELENV_BUILD']}",
+            f"--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
@@ -202,19 +203,20 @@ def build_ncurses(env, dirs, logfp):
             "--disable-stripping",
             f"--with-pkg-config={dirs.prefix}/lib/pkgconfig",
             "--enable-pc-files",
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            f"--build={env['RELENV_BUILD']}",
+            f"--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
         stdout=logfp,
     )
     runcmd(["make", "-j8"], env=env, stderr=logfp, stdout=logfp)
+    ticdir = str(pathlib.Path(dirs.tmpbuild) / "progs" / "tic")
     runcmd(
         [
             "make",
-            "DESTDIR={}".format(dirs.prefix),
-            "TIC_PATH={}".format(str(pathlib.Path(dirs.tmpbuild) / "progs" / "tic")),
+            f"DESTDIR={dirs.prefix}",
+            f"TIC_PATH={ticdir}",
             "install",
         ],
         env=env,
@@ -237,12 +239,12 @@ def build_readline(env, dirs, logfp):
     env["LDFLAGS"] = f"{env['LDFLAGS']} -ltinfow"
     cmd = [
         "./configure",
-        "--prefix={}".format(dirs.prefix),
+        f"--prefix={dirs.prefix}",
     ]
     if env["RELENV_HOST"].find("linux") > -1:
         cmd += [
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            f"--build={env['RELENV_BUILD']}",
+            f"--host={env['RELENV_HOST']}",
         ]
     runcmd(cmd, env=env, stderr=logfp, stdout=logfp)
     runcmd(["make", "-j8"], env=env, stderr=logfp, stdout=logfp)
@@ -263,10 +265,10 @@ def build_libffi(env, dirs, logfp):
     runcmd(
         [
             "./configure",
-            "--prefix={}".format(dirs.prefix),
+            f"--prefix={dirs.prefix}",
             "--disable-multi-os-directory",
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            f"--build={env['RELENV_BUILD']}",
+            "--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
@@ -291,12 +293,12 @@ def build_zlib(env, dirs, logfp):
     :param logfp: A handle for the log file
     :type logfp: file
     """
-    env["CFLAGS"] = "-fPIC {}".format(env["CFLAGS"])
+    env["CFLAGS"] = f"-fPIC {env['CFLAGS']}"
     runcmd(
         [
             "./configure",
-            "--prefix={}".format(dirs.prefix),
-            "--libdir={}/lib".format(dirs.prefix),
+            f"--prefix={dirs.prefix}",
+            f"--libdir={dirs.prefix}/lib",
             "--shared",
         ],
         env=env,
@@ -326,11 +328,11 @@ def build_krb(env, dirs, logfp):
     runcmd(
         [
             "./configure",
-            "--prefix={}".format(dirs.prefix),
+            "--prefix={dirs.prefix}",
             "--without-system-verto",
             "--without-libedit",
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            "--build={env['RELENV_BUILD']}",
+            "--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,

relenv/buildenv.py

@@ -53,23 +53,18 @@ def buildenv(relenv_path=None):
         "RELENV_PATH": f"{relenv_path}",
         "CC": f"{toolchain}/bin/{triplet}-gcc -no-pie",
         "CXX": f"{toolchain}/bin/{triplet}-g++ -no-pie",
-        "CFLAGS": (
-            #   f"-L{relenv_path}/lib -L{toolchain}/{triplet}/sysroot/lib "
-            f"-I{relenv_path}/include "
-            f"-I{toolchain}/sysroot/usr/include"
-        ),
+        "CFLAGS": f"-I{relenv_path}/include -I{toolchain}/sysroot/usr/include",
         "CXXFLAGS": (
-            f"-I{relenv_path}/include -I{toolchain}/{triplet}/sysroot/usr/include "
+            f"-I{relenv_path}/include "
+            f"-I{toolchain}/{triplet}/sysroot/usr/include "
             f"-L{relenv_path}/lib -L{toolchain}/{triplet}/sysroot/lib "
             f"-Wl,-rpath,{relenv_path}/lib"
         ),
         "CPPFLAGS": (
-            #   f"-L{relenv_path}/lib -L{toolchain}/{triplet}/sysroot/lib "
-            f"-I{relenv_path}/include -I{toolchain}/{triplet}/sysroot/usr/include"
+            f"-I{relenv_path}/include " f"-I{toolchain}/{triplet}/sysroot/usr/include"
         ),
         "CMAKE_CFLAGS": (
-            #   f"-L{relenv_path}/lib -L{toolchain}/{triplet}/sysroot/lib "
-            f"-I{relenv_path}/include -I{toolchain}/{triplet}/sysroot/usr/include"
+            f"-I{relenv_path}/include " f"-I{toolchain}/{triplet}/sysroot/usr/include"
         ),
         "LDFLAGS": (
             f"-L{relenv_path}/lib -L{toolchain}/{triplet}/sysroot/lib "

relenv/runtime.py

@@ -1035,5 +1035,11 @@ def bootstrap():
     setup_crossroot()
     install_cargo_config()
     sys.meta_path = [importer] + sys.meta_path
-    if "RELENV_BUILDENV" in os.environ:
-        os.environ.update(buildenv().buildenv())
+    # XXX This causes our m2crypto test to break
+    # if "RELENV_BUILDENV" in os.environ:
+    #    env = buildenv().buildenv()
+    #    for key in env:
+    #        if key in os.environ:
+    #            os.environ[key] = f"{env[key]} {os.environ[key]}"
+    #        else:
+    #            os.environ[key] = env[key]

tests/test_verify_build.py

@@ -342,7 +342,7 @@ def test_pip_install_salt_w_package_requirements(
         "26.4.0",
     ],
 )
-def test_pip_install_pyzmq(pipexec, pyzmq_version, build_version, arch):
+def test_pip_install_pyzmq(pipexec, pyzmq_version, build_version, arch, build):
 
     if pyzmq_version == "23.2.0" and "3.12" in build_version:
         pytest.xfail(f"{pyzmq_version} does not install on 3.12")
@@ -408,6 +408,21 @@ def test_pip_install_pyzmq(pipexec, pyzmq_version, build_version, arch):
     )
     assert p.returncode == 0, "Failed to pip install package requirements"
 
+    if shutil.which("docker"):
+        subprocess.run(
+            [
+                "docker",
+                "run",
+                "-v",
+                f"{build}:/test",
+                "amazonlinux:2",
+                "/test/bin/python3",
+                "-c",
+                "import zmq",
+            ],
+            check=True,
+        )
+
 
 def test_pip_install_cryptography(pipexec):
     packages = [
@@ -557,18 +572,32 @@ def test_pip_install_m2crypto_system_ssl(pipexec, pyexec):
 
 
 @pytest.mark.skip_unless_on_linux
-def test_pip_install_m2crypto_relenv_ssl(pipexec, pyexec, build):
+@pytest.mark.parametrize(
+    "m2crypto_version",
+    [
+        "0.38.0",
+    ],
+)
+def test_pip_install_m2crypto_relenv_ssl(
+    m2crypto_version, pipexec, pyexec, build, minor_version
+):
     env = os.environ.copy()
     env["RELENV_BUILDENV"] = "yes"
     env["RELENV_DEBUG"] = "yes"
     env["LDFLAGS"] = f"-L{build}lib"
-    env["CFLAGS"] = f"-I{build}/include"
-    env["SWIG_FEATURES"] = f"-I{build}/include"
+    env["CFLAGS"] = f"-I{build}/include -I{build}/include/python{minor_version}"
+    env["SWIG_FEATURES"] = f"-I{build}/include -I{build}/include/python{minor_version}"
     p = subprocess.run(
         ["swig", "-version"],
     )
     p = subprocess.run(
-        [str(pipexec), "install", "m2crypto", "--no-cache-dir", "-v"],
+        [
+            str(pipexec),
+            "install",
+            f"m2crypto=={m2crypto_version}",
+            "--no-cache-dir",
+            "-v",
+        ],
         env=env,
         stderr=subprocess.PIPE,
     )