From 02077d8206a44e96485ac7006e8e044dd755a269 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Fri, 10 Sep 2021 07:34:28 +0000
Subject: oeqa/sdk: assimp.py -> cmake.py

The downloaded non-free sources, now download expat-2.4.1.tar.bz2 to replace
it, and also rename the test case to cmake.py since it is used for testing cmake.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/lib/oeqa/sdk/cases/assimp.py | 40 ---------------------------------------
 meta/lib/oeqa/sdk/cases/cmake.py  | 40 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 meta/lib/oeqa/sdk/cases/assimp.py
 create mode 100644 meta/lib/oeqa/sdk/cases/cmake.py

diff --git a/meta/lib/oeqa/sdk/cases/assimp.py b/meta/lib/oeqa/sdk/cases/assimp.py
deleted file mode 100644
index f166758e49..0000000000
--- a/meta/lib/oeqa/sdk/cases/assimp.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# SPDX-License-Identifier: MIT
-#
-
-import os
-import subprocess
-import tempfile
-import unittest
-from oeqa.sdk.case import OESDKTestCase
-
-from oeqa.utils.subprocesstweak import errors_have_output
-errors_have_output()
-
-class BuildAssimp(OESDKTestCase):
-    """
-    Test case to build a project using cmake.
-    """
-
-    def setUp(self):
-        if not (self.tc.hasHostPackage("nativesdk-cmake") or
-                self.tc.hasHostPackage("cmake-native")):
-            raise unittest.SkipTest("Needs cmake")
-
-    def test_assimp(self):
-        with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir) as testdir:
-            tarball = self.fetch(testdir, self.td["DL_DIR"], "https://github.com/assimp/assimp/archive/v4.1.0.tar.gz")
-
-            dirs = {}
-            dirs["source"] = os.path.join(testdir, "assimp-4.1.0")
-            dirs["build"] = os.path.join(testdir, "build")
-            dirs["install"] = os.path.join(testdir, "install")
-
-            subprocess.check_output(["tar", "xf", tarball, "-C", testdir], stderr=subprocess.STDOUT)
-            self.assertTrue(os.path.isdir(dirs["source"]))
-            os.makedirs(dirs["build"])
-
-            self._run("cd {build} && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON {source}".format(**dirs))
-            self._run("cmake --build {build} -- -j".format(**dirs))
-            self._run("cmake --build {build} --target install -- DESTDIR={install}".format(**dirs))
-            self.check_elf(os.path.join(dirs["install"], "usr", "local", "lib", "libassimp.so.4.1.0"))
diff --git a/meta/lib/oeqa/sdk/cases/cmake.py b/meta/lib/oeqa/sdk/cases/cmake.py
new file mode 100644
index 0000000000..24741d4c0a
--- /dev/null
+++ b/meta/lib/oeqa/sdk/cases/cmake.py
@@ -0,0 +1,40 @@
+#
+# SPDX-License-Identifier: MIT
+#
+
+import os
+import subprocess
+import tempfile
+import unittest
+from oeqa.sdk.case import OESDKTestCase
+
+from oeqa.utils.subprocesstweak import errors_have_output
+errors_have_output()
+
+class BuildAssimp(OESDKTestCase):
+    """
+    Test case to build a project using cmake.
+    """
+
+    def setUp(self):
+        if not (self.tc.hasHostPackage("nativesdk-cmake") or
+                self.tc.hasHostPackage("cmake-native")):
+            raise unittest.SkipTest("Needs cmake")
+
+    def test_cmake(self):
+        with tempfile.TemporaryDirectory(prefix="cmake", dir=self.tc.sdk_dir) as testdir:
+            tarball = self.fetch(testdir, self.td["DL_DIR"], "https://downloads.sourceforge.net/expat/expat-2.4.1.tar.bz2")
+
+            dirs = {}
+            dirs["source"] = os.path.join(testdir, "expat-2.4.1")
+            dirs["build"] = os.path.join(testdir, "build")
+            dirs["install"] = os.path.join(testdir, "install")
+
+            subprocess.check_output(["tar", "xf", tarball, "-C", testdir], stderr=subprocess.STDOUT)
+            self.assertTrue(os.path.isdir(dirs["source"]))
+            os.makedirs(dirs["build"])
+
+            self._run("cd {build} && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON {source}".format(**dirs))
+            self._run("cmake --build {build} -- -j".format(**dirs))
+            self._run("cmake --build {build} --target install -- DESTDIR={install}".format(**dirs))
+            self.check_elf(os.path.join(dirs["install"], "usr", "local", "lib", "libexpat.so.1.8.1"))
-- 
cgit 1.2.3-korg