Skip to contentSkip to conversation

repair build script and add target lib check

PATCH Applied Song Cai 2 participants 2 messages Oct 13, 2017 – Oct 17, 2017

lore
Share & tools
lore

Song Cai

author
#0 lore raw

PATCH 4/18 repair build script and add target lib check

repair lwip build script
and add pre_check of library lwip

---
 engine/tests/Functional.lwip/fuego_test.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
engine/tests/Functional.lwip/fuego_test.sh +11 -1
index 17d15af..bf7ff1a 100755
@@ -1,6 +1,15 @@
 tarball=lwip.tar.gz
 
+function  pre_check {
+    is_on_target liblwip.so LIB_LWIP /lib:/usr/lib:/usr/local/lib
+    assert_define LIB_LWIP
+}
+
 function test_build {
+    [ -d build ] || mkdir build
+    cd build
+    cmake .. && make
+    cd -
     cd contrib/apps/func_tests
     make
     cd -
@@ -32,7 +41,8 @@ function test_build {
 }
 
 function test_deploy {
-    put run-tests.sh contrib/apps/func_tests/*_test  $BOARD_TESTDIR/fuego.$TESTDIR/;
+    put build/lib/liblwip.a build/lib/liblwip.so build/lib/liblwip.so.2.0.0 \
+        run-tests.sh contrib/apps/func_tests/*_test  $BOARD_TESTDIR/fuego.$TESTDIR/;
 }
 
 function test_run {
Signature · 1 line
2.9.3.windows.3
#1 lore raw
Quoted 21 lines

-----Original Message-----
From: [email protected] [mailto:fuego- [email protected]] On Behalf Of Song Cai
Sent: Friday, October 13, 2017 3:06 AM
To: [email protected]
Subject: [Fuego] [PATCH 04/18] repair build script and add target lib check

repair lwip build script
and add pre_check of library lwip

---
 engine/tests/Functional.lwip/fuego_test.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
engine/tests/Functional.lwip/fuego_test.sh +0 -0
index 17d15af..bf7ff1a 100755

engine/tests/Functional.lwip/fuego_test.sh line 3

Quoted 3 lines
engine/tests/Functional.lwip/fuego_test.sh +1 -0
@@ -1,6 +1,15 @@
 tarball=lwip.tar.gz
 
+function  pre_check {

That should be 'funtion test_pre_check'

Quoted 23 lines
engine/tests/Functional.lwip/fuego_test.sh +10 -1
+    is_on_target liblwip.so LIB_LWIP /lib:/usr/lib:/usr/local/lib
+    assert_define LIB_LWIP
+}
+
 function test_build {
+    [ -d build ] || mkdir build
+    cd build
+    cmake .. && make
+    cd -
     cd contrib/apps/func_tests
     make
     cd -
@@ -32,7 +41,8 @@ function test_build {
 }
 
 function test_deploy {
-    put run-tests.sh contrib/apps/func_tests/*_test
 $BOARD_TESTDIR/fuego.$TESTDIR/;
+    put build/lib/liblwip.a build/lib/liblwip.so build/lib/liblwip.so.2.0.0 \
+        run-tests.sh contrib/apps/func_tests/*_test
 $BOARD_TESTDIR/fuego.$TESTDIR/;
 }
Quoted 4 lines

function test_run {
--
2.9.3.windows.3

I don't have a board with liblwip, so I can't test this. However, the test_pre_check works. That is, it aborts the test on my boards when the board doesn't have the library.

I assume that liblwip is in the default build of AGL?

Unfortunately, I can't test the build fix. It's possible we should add liblwipv6-dev to our list of package to install in fuego-ro/toolchains/install_cross_toolchain.sh.

In any event: applied.

Thanks,
-- Tim