Update llvm script and move test to make

Signed-off-by: Viet Anh Duong <anh.duong@kyber.network>

.github/workflows/ci.yaml

@@ -38,12 +38,9 @@ jobs:
           sudo docker cp "$ID:/usr/local/bin/clang-amd64" /usr/local/bin
           sudo docker cp "$ID:/usr/local/bin/clang-arm64" /usr/local/bin
           docker rm $ID
-          ls -lah /usr/local/bin/clang*
 
       - name: Run Test
         run: |
-          sudo apt-get install -y make
-          TEST_CC=$(which clang) go test ./... -v -exec=sudo -count=1
-
-      - name: Build examples
-        run: make -C examples CC=$(which clang) BUILD_BPF=1 build-all
+          sudo apt-get install -y make && \
+            make test &&
+            make build-examples

Makefile

@@ -1,6 +1,8 @@
 SHELL = /usr/bin/env bash
 DOCKER ?= docker
+GO ?= go
 
+CLANG ?= $$(which clang)
 LLVM_VERSION = 15.0.7
 
 IMAGE_REPO = ghcr.io/vietanhduong
@@ -11,8 +13,13 @@ CURRENT_SHORT_COMMIT = $$(git rev-parse --short HEAD)
 
 .PHONY: build-examples
 build-examples:
-	make -C examples build-all
+	make -C examples CC=$(CLANG) BUILD_BPF=1 build-all
 
+.PHONY: test
+test:
+	sudo TEST_CC=$(CLANG) $(GO) test ./... -v -count=1
+
+## DOCKER
 .PHONY: push-llvm
 push-llvm: build-llvm
 	$(DOCKER) push $(LLVM_IMAGE):$(LLVM_VERSION)

compiler/compiler_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"github.com/vietanhduong/wbpf"
 )
 
 func Test_Compile(t *testing.T) {
@@ -71,6 +72,10 @@ func Test_Compile(t *testing.T) {
 			require.Nil(t, err)
 			require.False(t, info.IsDir())
 			require.NotZero(t, info.Size())
+
+			mod, err := wbpf.NewModule(wbpf.WithElfFile(output))
+			require.NoError(t, err, "Failed to new wbpf module")
+			mod.Close()
 		})
 	}
 }

docker/llvm/Dockerfile

@@ -3,17 +3,12 @@ FROM ubuntu:22.04 as builder
 ARG LLVM_VERSION=15.0.7
 ENV LLVM_VERSION=${LLVM_VERSION}
 
-COPY install_deps.sh /install_deps.sh
+COPY *.sh /
 
-RUN /install_deps.sh
-
-COPY build_llvm_native.sh /build_llvm_native.sh
-
-RUN /build_llvm_native.sh
-
-COPY build_llvm_cross_aarch64.sh /build_llvm_cross_aarch64.sh
-
-RUN /build_llvm_cross_aarch64.sh
+RUN /install_deps.sh && \
+  /download_llvm.sh && \
+  /build_llvm_native.sh \
+  /build_llvm_cross_aarch64.sh
 
 FROM ubuntu:22.04 as rootfs
 

docker/llvm/build_llvm_native.sh

@@ -5,11 +5,7 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-mkdir -p /src/llvm/llvm/build-native &&
-  curl -sSL "https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${LLVM_VERSION}.tar.gz" |
-  tar -xzf - --strip-components=1 -C /src/llvm
-
-cd /src/llvm/llvm/build-native
+mkdir -p /src/llvm/llvm/build-native && cd $_
 
 cmake .. -G "Ninja" \
   -DLLVM_TARGETS_TO_BUILD="BPF" \

docker/llvm/download_llvm.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -o xtrace
+set -o errexit
+set -o pipefail
+set -o nounset
+
+LLVM_SRC=/src/llvm
+
+mkdir -p $LLVM_SRC &&
+  curl -sSL "https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${LLVM_VERSION}.tar.gz" |
+  tar -xzf - --strip-components=1 -C $LLVM_SRC