Merge pull request #88 from libos-nuse/arm-ci

[RFC] lkl: add arm-linux-androidabi- cross build

Author: Octavian Purdila

circle.yml

@@ -5,12 +5,17 @@ general:
 machine:
   # Add some environment variables
   environment:
-    CROSS_COMPILE: $([[ $CIRCLE_NODE_INDEX -eq 1 ]] && echo 'i686-w64-mingw32-')
+    CROSS_COMPILE: $(case $CIRCLE_NODE_INDEX in 0) host='' ;; 1) host='i686-w64-mingw32-' ;; 2) host='arm-linux-androideabi-' ;; esac; echo $host)
+    PATH: /home/ubuntu/android-toolchain/bin:${PATH}
 
 ## Customize dependencies
 dependencies:
   pre:
-    - sudo apt-get update; sudo apt-get install bc libfuse-dev libarchive-dev xfsprogs valgrind gcc-mingw-w64-i686 wine
+    # required for 14.04 container
+    # - sudo dpkg --add-architecture i386
+    - sudo apt-get update; sudo apt-get install bc libfuse-dev libarchive-dev xfsprogs valgrind gcc-mingw-w64-i686 wine qemu-user-static
+    - /usr/local/android-ndk/build/tools/make-standalone-toolchain.sh --platform=android-21 --install-dir=/home/ubuntu/android-toolchain --arch=arm
+
 
 test:
   pre:
@@ -22,8 +27,10 @@ test:
         parallel: true
     - cd tools/lkl && make -j8:
         parallel: true
-    - cd tools/lkl && make test:
+    - cd tools/lkl && if [ $CIRCLE_NODE_INDEX -eq 2 ] ; then make tests/boot-in.o; arm-linux-androideabi-gcc -o tests/boot tests/boot-in.o liblkl.a -static ; fi:
         parallel: true
+    - cd tools/lkl && make test:
+         parallel: true
 
     - ? >
         if [ -n "${RUN_NIGHTLY_BUILD}" ]; then

tools/lkl/Makefile

@@ -94,7 +94,7 @@ $(TEST_TARGETS): tests/boot
 
 # because of libdl, liblkl-hijack will not compile on windows
 # fortunately, the test target will handle a missing libhijack.so correctly
-ifeq (,$(filter $(OUTPUT_FORMAT),pe-i386))
+ifeq (,$(filter $(OUTPUT_FORMAT),pe-i386 elf32-littlearm))
   test: liblkl-hijack$(SOSUF)
 endif
 
@@ -117,7 +117,8 @@ cpfromfs$(EXESUF): cptofs$(EXESUF)
 
 # because of argp and fuse, none of the binaries will compile on windows
 # because of libdl, liblkl-hijack will not compile on windows
-ifneq (,$(filter $(OUTPUT_FORMAT),pe-i386))
+# arm-android neither for the moment
+ifneq (,$(filter $(OUTPUT_FORMAT),pe-i386 elf32-littlearm))
   all: $(filter-out liblkl-hijack$(SOSUF), $(ALL_LIBRARIES))
 else
   all: $(ALL_PROGRAMS) $(ALL_LIBRARIES)

tools/lkl/lib/posix-host.c

@@ -266,7 +266,7 @@ static void panic(void)
 	assert(0);
 }
 
-static long gettid(void)
+static long _gettid(void)
 {
 	return syscall(SYS_gettid);
 }
@@ -298,7 +298,7 @@ struct lkl_host_operations lkl_host_ops = {
 	.ioremap = lkl_ioremap,
 	.iomem_access = lkl_iomem_access,
 	.virtio_devices = lkl_virtio_devs,
-	.gettid = gettid,
+	.gettid = _gettid,
 };
 
 static int fd_get_capacity(union lkl_disk disk, unsigned long long *res)

tools/lkl/tests/boot.sh

@@ -24,10 +24,13 @@ if [ -c /dev/net/tun ]; then
 fi;
 
 if file ./boot | grep PE32; then
-    WINE=wine
+    WRAP=wine
+elif file ./boot | grep ARM; then
+    WRAP=qemu-arm-static
 fi
 
-${TEST_CMD} $WINE ./boot -d $file -t $fstype $tap_args $LKL_TEST_DEBUG $@ || err=$?
+
+${TEST_CMD} $WRAP ./boot -d $file -t $fstype $tap_args $LKL_TEST_DEBUG $@ || err=$?
 
 if [ -c /dev/net/tun ]; then
     sudo ip tuntap del dev lkl_boot mode tap || true