[Fuego] [PATCH] Functional.glib: support for multic versions glib

* [Fuego] [PATCH] Functional.glib: support for multic versions glib
@ 2018-07-16 11:29 Li Xiaoming
  2018-07-20 23:53 ` Tim.Bird
  0 siblings, 1 reply; 4+ messages in thread
From: Li Xiaoming @ 2018-07-16 11:29 UTC (permalink / raw)
  To: fuego

Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
---
 engine/tests/Functional.glib/fuego_test.sh | 59 +++++++++++++++++++++++++-----
 engine/tests/Functional.glib/spec.json     | 13 ++++++-
 2 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/engine/tests/Functional.glib/fuego_test.sh b/engine/tests/Functional.glib/fuego_test.sh
index b69c05c..dbcc468 100755
--- a/engine/tests/Functional.glib/fuego_test.sh
+++ b/engine/tests/Functional.glib/fuego_test.sh
@@ -1,22 +1,55 @@
-tarball=glib-2.22.1.tar.bz2
+tarball=$FUNCTIONAL_GLIB_PACKAGE
 
 function test_build {
-    patch -p0 -N -s < $TEST_HOME/glib-strfuncs.patch
+    if [[ $tarball =~ "2.22" ]]
+    then
+	patch -p0 -N -s < $TEST_HOME/glib-strfuncs.patch
+    fi
+
     # Don't run tests on the build host
     find . -name 'Makefile*' | xargs sed -i '/@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}/d'
     echo -e "glib_cv_stack_grows=no \nglib_cv_uscore=no \nac_cv_func_posix_getpwuid_r=no \nac_cv_func_nonposix_getpwuid_r=no \nac_cv_func_posix_getgrgid_r=no" > config.cross
     # get updated config.sub and config.guess files, so configure
     # doesn't reject new toolchains
     cp /usr/share/misc/config.{sub,guess} .
-    ./configure --prefix=`pwd`/build --cache-file=config.cross --host=$HOST --target=$HOST --build=`uname -m`-linux-gnu CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CXXFLAGS="$CXXFLAGS"
-    make 2>&1
-    cd tests && make test; cd -
-    cd glib/tests && make test; cd -
+
+    if [[ $tarball =~ "2.22" ]]
+    then
+        ./configure --prefix=`pwd`/build --cache-file=config.cross --host=$HOST --target=$HOST --build=`uname -m`-linux-gnu CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CXXFLAGS="$CXXFLAGS"
+        make 2>&1
+	cd tests && make test; cd -
+        cd glib/tests && make test; cd -
+    fi
+
+    if [[ $tarball =~ "2.46" ]] || [[ $tarball =~ "2.48" ]]
+    then
+	./configure --prefix=`pwd`/build  --enable-always-build-tests --cache-file=config.cross --host=$HOST --target=$HOST --build=`uname -m`-linux-gnu CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CXXFLAGS="$CXXFLAGS"
+        make 2>&1
+        cd tests && make; cd -
+        cd glib/tests && make; cd -
+    fi
 }
 
 function test_deploy {
-	# Makefile.am is used by 'contexts' test. XXX - why?
-	put gio/tests/Makefile.am `find . -name .libs | xargs -IDIRS find DIRS -not -type d -not -name '*.so*' -not -name '*.la*' -perm /u+x`  $BOARD_TESTDIR/fuego.$TESTDIR/
+    put `find . -name .libs | xargs -IDIRS find DIRS -not -type d -not -name '*.so*' -not -name '*.la*' -perm /u+x`  $BOARD_TESTDIR/fuego.$TESTDIR/
+
+    if [[ $tarball =~ "2.22" ]]
+    then
+	#glib2.22 contexts nedd gio/tests/Makefile.am
+	put gio/tests/Makefile.am $BOARD_TESTDIR/fuego.$TESTDIR/
+    fi
+
+    if [[ $tarball =~ "2.46" ]] || [[ $tarball =~ "2.48" ]]
+    then
+        #glib(2.46 2.48) contexts need gio/tests/contexts.c
+        put gio/tests/contexts.c $BOARD_TESTDIR/fuego.$TESTDIR/
+
+        #glib(2.46 2.48) keyfile need glib/tests/keyfiletest.ini,glib/tests/keyfile.c,glib/tests/pages.ini
+        put glib/tests/keyfiletest.ini glib/tests/keyfile.c glib/tests/pages.ini $BOARD_TESTDIR/fuego.$TESTDIR/
+
+        #glib(2.46 2.48) g-icon need gio/tests/g-icon.c
+        put gio/tests/g-icon.c $BOARD_TESTDIR/fuego.$TESTDIR/
+    fi
 }
 
 # Excluded tests
@@ -40,7 +73,15 @@ function test_deploy {
 # filter-streams
 
 function test_run {
-	report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./gtester  ./objects ./readwrite ./g-file ./fileutils ./data-output-stream ./signal3 ./properties ./rand ./memory-input-stream ./sleepy-stream  ./g-icon ./array-test ./strfuncs ./testgdateparser ./srvtarget ./threadtests ./keyfile ./string ./hostutils ./memory-output-stream ./objects2 ./closures ./scannerapi ./testgdate ./data-input-stream ./signal2 ./signal1 ./testgobject ./g-file-info ./simple-async-result ./buffered-input-stream ./contexts ./printf ./properties2 ./unix-streams "  
+    if [[ $tarball =~ "2.22" ]]
+    then
+	report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./gtester  ./objects ./readwrite ./g-file ./fileutils ./data-output-stream ./signal3 ./properties ./rand ./memory-input-stream ./sleepy-stream  ./g-icon ./array-test ./strfuncs ./testgdateparser ./srvtarget ./threadtests ./keyfile ./string ./hostutils ./memory-output-stream ./objects2 ./closures ./scannerapi ./testgdate ./data-input-stream ./signal2 ./signal1 ./testgobject ./g-file-info ./simple-async-result ./buffered-input-stream ./contexts ./printf ./properties2 ./unix-streams "
+    fi
+
+    if [[ $tarball =~ "2.46" ]] || [[ $tarball =~ "2.48" ]]
+    then
+	report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./gtester ./readwrite  ./g-file  ./data-output-stream  ./properties ./rand ./memory-input-stream ./sleepy-stream  ./array-test ./strfuncs  ./srvtarget  ./string ./hostutils ./memory-output-stream   ./scannerapi ./data-input-stream  ./g-file-info ./simple-async-result ./buffered-input-stream   ./test-printf  ./unix-streams  ./contexts ./keyfile ./g-icon "
+    fi
 }
 
 function test_processing {
diff --git a/engine/tests/Functional.glib/spec.json b/engine/tests/Functional.glib/spec.json
index 8bc2da5..5b06923 100644
--- a/engine/tests/Functional.glib/spec.json
+++ b/engine/tests/Functional.glib/spec.json
@@ -1,6 +1,17 @@
 {
     "testName": "Functional.glib",
     "specs": {
-        "default": {}
+	 "default": {
+	      "VERSION":"2.22.1",
+	      "PACKAGE":"glib-2.22.1.tar.bz2"
+	 },
+	 "2-46": {
+	      "VERSION":"2.46.2",
+	      "PACKAGE":"glib-2.46.2.tar.bz2"
+	 },
+         "2-48":{
+              "VERSION":"2.48.2",
+              "PACKAGE":"glib-2.48.2.tar.bz2"
+	}
     }
 }
-- 
2.7.4




^ permalink raw reply related	[flat|nested] 4+ messages in thread