Em Wed, Aug 15, 2018 at 08:02:48PM +1000, Michael Ellerman escreveu: > Jiri Olsa <jo...@redhat.com> writes: > > On Tue, Aug 14, 2018 at 03:06:44PM -0300, Arnaldo Carvalho de Melo wrote: > >> Em Tue, Aug 14, 2018 at 09:27:26AM +0200, Jiri Olsa escreveu: > >> > sry.. Arnaldo, would you change it for simple cd (attached below) > >> > or should I send the fix?
> >> Nah, I'm folding this in, to keep it bisectable. > > any chance one of your docker tests could run build in sh/zsh? ;-) It does already, see below :-) > Just using an Ubuntu image, where /bin/sh == dash should work, that's > how I hit it. So, I do the tests only prior to pushing to Ingo, so didn't catch this, lemme check, put that change back on, start a ubuntu:18.04 perf build container, try to build, see if it would fail, yeah, I'd have detected this before pushing to Ingo, so probably I have to run the tests before pushing to my acme/perf/core branch, will try to operate like that from now on. [root@jouet perf]# git diff diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh index 466540ee8ea7..80bf84803677 100755 --- a/tools/perf/check-headers.sh +++ b/tools/perf/check-headers.sh @@ -88,7 +88,7 @@ check () { # differences. test -d ../../include || exit 0 -cd ../.. +pushd ../.. > /dev/null # simple diff check for i in $HEADERS; do @@ -104,4 +104,4 @@ check include/uapi/linux/mman.h '-I "^#include <\(uapi/\)*asm/mman.h>"' # diff non-symmetric files check_2 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl -cd tools/perf +popd > /dev/null [root@jouet perf]# docker run --privileged --entrypoint=/bin/sh -v /home/acme/git:/git:Z --rm -ti docker.io/acmel/linux-perf-tools-build-ubuntu:18.04 $ bash perfbuilder@65ead4a4734a:/$ cd /git/perf perfbuilder@65ead4a4734a:/git/perf$ make -C tools/perf O=/tmp/build/perf/ install-bin make: Entering directory '/git/perf/tools/perf' BUILD: Doing 'make -j4' parallel build HOSTCC /tmp/build/perf/fixdep.o HOSTLD /tmp/build/perf/fixdep-in.o LINK /tmp/build/perf/fixdep ./check-headers.sh: 91: ./check-headers.sh: pushd: not found diff: tools/perf/arch/x86/entry/syscalls/syscall_64.tbl: No such file or directory Warning: Kernel ABI header at 'tools/perf/arch/x86/entry/syscalls/syscall_64.tbl' differs from latest version at 'arch/x86/entry/syscalls/syscall_64.tbl' diff -u tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl ./check-headers.sh: 107: ./check-headers.sh: popd: not found Makefile.perf:205: recipe for target 'sub-make' failed make[1]: *** [sub-make] Error 127 Makefile:109: recipe for target 'install-bin' failed make: *** [install-bin] Error 2 make: Leaving directory '/git/perf/tools/perf' perfbuilder@65ead4a4734a:/git/perf$