Skip to contentSkip to conversation

glib-2.0: update ptest multilib fix

PATCH In review Jeremy A. Puhlman 1 participant 2 messages Mar 17, 2020 – Mar 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 glib-2.0: update ptest multilib fix

From: Jeremy Puhlman <[email protected]>

The updates to the tests are done in do_install instead of do_install_ptest, so the changes need to consider ptest not being turned on.

---
 meta/recipes-core/glib-2.0/glib.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-core/glib-2.0/glib.inc +2 -0
index edecc51fdb..7ebed0e5fd 100644
@@ -128,9 +128,11 @@ do_install_append_class-target () {
 			rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
 		fi
 	fi
+	if [ -f ${D}${datadir}/installed-tests/glib/static-link.test ]; then
         if test "x${MLPREFIX}" != "x"; then
                 mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
         fi
+	fi
 }
 
 # As we do not build python3 for windows, makes no sense to ship the script that's using it
Signature · 1 line
2.13.3
#1 lore raw

Ping.

Quoted 26 lines · Jeremy A. Puhlman

From: Jeremy Puhlman <[email protected]>

The updates to the tests are done in do_install instead of do_install_ptest, so the changes need to consider ptest not being turned on.

---
  meta/recipes-core/glib-2.0/glib.inc | 2 ++
  1 file changed, 2 insertions(+)
meta/recipes-core/glib-2.0/glib.inc +2 -0
index edecc51fdb..7ebed0e5fd 100644
@@ -128,9 +128,11 @@ do_install_append_class-target () {
  			rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
  		fi
  	fi
+	if [ -f ${D}${datadir}/installed-tests/glib/static-link.test ]; then
          if test "x${MLPREFIX}" != "x"; then
                  mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
          fi
+	fi
  }
 
  # As we do not build python3 for windows, makes no sense to ship the script that's using it
Signature · 2 lines
Jeremy A. Puhlman
[email protected]