Merge pull request torvalds#404 from libos-nuse/fix-valgrind-test

Fix valgrind nightly test
Mic92 · Jan 7, 2018 · fdf1933 · fdf1933
2 parents d652f09 + a4bbfd1
commit fdf1933
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -70,7 +70,13 @@ do_steps: &do_steps
  command: |
  mkdir -p ~/junit
  make -C tools/lkl run-tests tests="--junit-dir ~/junit"
+ # convert valgrind test results
+ if [[ -n "$VALGRIND" ]]; then
+ cd ./tools/lkl/ && find ./ -type f -name "valgrind-*.xml" \
+ -exec ./tests/valgrind2xunit.py {} \;
+ fi
  find ./tools/lkl/ -type f -name "*.xml" -exec mv {} ~/junit/ \;
+ no_output_timeout: "30m"
  - store_test_results:
  path: ~/junit
  - store_artifacts:
@@ -80,7 +86,7 @@ do_steps: &do_steps
 jobs:
  x86_64:
  docker:
- - image: lkldocker/circleci-x86_64:0.3
+ - image: lkldocker/circleci-x86_64:0.5
  environment:
  CROSS_COMPILE: ""
  MKARG: "dpdk=yes"
@@ -113,7 +119,7 @@ jobs:
 
  x86_64_valgrind:
  docker:
- - image: lkldocker/circleci-x86_64:0.3
+ - image: lkldocker/circleci-x86_64:0.5
  environment:
  CROSS_COMPILE: ""
  MKARG: "dpdk=yes"

diff --git a/tools/lkl/Makefile.autoconf b/tools/lkl/Makefile.autoconf
@@ -2,8 +2,9 @@ POSIX_HOSTS=elf64-x86-64 elf32-i386 elf64-x86-64-freebsd elf32-littlearm elf64-l
 NT_HOSTS=pe-i386 pe-x86-64
 
 define set_autoconf_var
- $(file >> $(OUTPUT)/include/autoconf.h,#define LKL_HOST_CONFIG_$(1) $(2))
- $(file >> $(OUTPUT)/tests/autoconf.sh,LKL_HOST_CONFIG_$(1)=$(2))
+ $(shell echo "#define LKL_HOST_CONFIG_$(1) $(2)" \
+ >> $(OUTPUT)/include/autoconf.h)
+ $(shell echo "LKL_HOST_CONFIG_$(1)=$(2)" >> $(OUTPUT)/tests/autoconf.sh)
  export LKL_HOST_CONFIG_$(1)=$(2)
 endef
 
@@ -85,7 +86,10 @@ define do_autoconf
  $(if $(filter $(LD_FMT),$(NT_HOSTS)),$(call nt_host,$(LD_FMT)))
 endef
 
+export do_autoconf
+
+
 $(OUTPUT)Makefile.conf: Makefile.autoconf
- $(file > $(OUTPUT)/include/autoconf.h)
- $(file > $(OUTPUT)/tests/autoconf.sh)
- $(file > $(OUTPUT)/Makefile.conf,$(call do_autoconf))
+ $(shell echo -n "" > $(OUTPUT)/include/autoconf.h)
+ $(shell echo -n "" > $(OUTPUT)/tests/autoconf.sh)
+ @echo "$$do_autoconf" > $(OUTPUT)/Makefile.conf
diff --git a/tools/lkl/tests/net.sh b/tools/lkl/tests/net.sh
@@ -58,6 +58,10 @@ setup_backend()
  "loopback")
  ;;
  "pipe")
+ if [ -n "$VALGRIND" ]; then
+ echo "pipe test with valgrind takes so long: skip"
+ return $TEST_SKIP
+ fi
  if [ -z $(lkl_test_cmd which mkfifo) ]; then
  echo "no mkfifo command"
  return $TEST_SKIP