| Message ID | 20200923073931.74769-1-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [kvm-unit-tests] travis.yml: Fix the getopt problem | expand |
On 23/09/20 09:39, Thomas Huth wrote: > The enhanced getopt is now not selected with a configure switch > anymore, but by setting the PATH to the right location. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > This fixes the new macOS build jobs on Travis : > https://travis-ci.com/github/huth/kvm-unit-tests/builds/186146708 > > .travis.yml | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Pushed, and I also linked the gitlab repo to Travis: https://travis-ci.com/gitlab/kvm-unit-tests/KVM-Unit-Tests Paolo > diff --git a/.travis.yml b/.travis.yml > index ae4ed08..2e5ae41 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -128,8 +128,7 @@ jobs: > - qemu > - x86_64-elf-gcc > env: > - - CONFIG="--cross-prefix=x86_64-elf- > - --getopt=/usr/local/opt/gnu-getopt/bin/getopt" > + - CONFIG="--cross-prefix=x86_64-elf-" > - BUILD_DIR="build" > - TESTS="ioapic-split smptest smptest3 vmexit_cpuid vmexit_mov_from_cr8 > vmexit_mov_to_cr8 vmexit_inl_pmtimer vmexit_ipi vmexit_ipi_halt > @@ -137,6 +136,7 @@ jobs: > vmexit_tscdeadline_immed eventinj msr port80 setjmp > syscall tsc rmap_chain umip intel_iommu" > - ACCEL="tcg" > + - PATH="/usr/local/opt/gnu-getopt/bin:$PATH" > > - os: osx > osx_image: xcode11.6 > @@ -149,8 +149,7 @@ jobs: > - qemu > - i686-elf-gcc > env: > - - CONFIG="--arch=i386 --cross-prefix=i686-elf- > - --getopt=/usr/local/opt/gnu-getopt/bin/getopt" > + - CONFIG="--arch=i386 --cross-prefix=i686-elf-" > - BUILD_DIR="build" > - TESTS="cmpxchg8b vmexit_cpuid vmexit_mov_from_cr8 vmexit_mov_to_cr8 > vmexit_inl_pmtimer vmexit_ipi vmexit_ipi_halt > @@ -158,6 +157,7 @@ jobs: > vmexit_tscdeadline_immed eventinj port80 setjmp tsc > taskswitch umip" > - ACCEL="tcg" > + - PATH="/usr/local/opt/gnu-getopt/bin:$PATH" > > before_script: > - if [ "$ACCEL" = "kvm" ]; then >
On 23/09/2020 10.14, Paolo Bonzini wrote: > On 23/09/20 09:39, Thomas Huth wrote: >> The enhanced getopt is now not selected with a configure switch >> anymore, but by setting the PATH to the right location. >> >> Signed-off-by: Thomas Huth <thuth@redhat.com> >> --- >> This fixes the new macOS build jobs on Travis : >> https://travis-ci.com/github/huth/kvm-unit-tests/builds/186146708 >> >> .travis.yml | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) > > Pushed, and I also linked the gitlab repo to Travis: > > https://travis-ci.com/gitlab/kvm-unit-tests/KVM-Unit-Tests Oh, that's sweet, thanks! I didn't know that Travis can also access gitlab repositories now :-) Thomas
On 23/09/20 10:29, Thomas Huth wrote: > On 23/09/2020 10.14, Paolo Bonzini wrote: >> On 23/09/20 09:39, Thomas Huth wrote: >>> The enhanced getopt is now not selected with a configure switch >>> anymore, but by setting the PATH to the right location. >>> >>> Signed-off-by: Thomas Huth <thuth@redhat.com> >>> --- >>> This fixes the new macOS build jobs on Travis : >>> https://travis-ci.com/github/huth/kvm-unit-tests/builds/186146708 >>> >>> .travis.yml | 8 ++++---- >>> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> Pushed, and I also linked the gitlab repo to Travis: >> >> https://travis-ci.com/gitlab/kvm-unit-tests/KVM-Unit-Tests > > Oh, that's sweet, thanks! I didn't know that Travis can also access > gitlab repositories now :-) Silver lining of being shamed :) Paolo
On Wed, Sep 23, 2020 at 09:39:31AM +0200, Thomas Huth wrote: > The enhanced getopt is now not selected with a configure switch > anymore, but by setting the PATH to the right location. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > This fixes the new macOS build jobs on Travis : > https://travis-ci.com/github/huth/kvm-unit-tests/builds/186146708 > > .travis.yml | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index ae4ed08..2e5ae41 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -128,8 +128,7 @@ jobs: > - qemu > - x86_64-elf-gcc > env: > - - CONFIG="--cross-prefix=x86_64-elf- > - --getopt=/usr/local/opt/gnu-getopt/bin/getopt" > + - CONFIG="--cross-prefix=x86_64-elf-" > - BUILD_DIR="build" > - TESTS="ioapic-split smptest smptest3 vmexit_cpuid vmexit_mov_from_cr8 > vmexit_mov_to_cr8 vmexit_inl_pmtimer vmexit_ipi vmexit_ipi_halt > @@ -137,6 +136,7 @@ jobs: > vmexit_tscdeadline_immed eventinj msr port80 setjmp > syscall tsc rmap_chain umip intel_iommu" > - ACCEL="tcg" > + - PATH="/usr/local/opt/gnu-getopt/bin:$PATH" > > - os: osx > osx_image: xcode11.6 > @@ -149,8 +149,7 @@ jobs: > - qemu > - i686-elf-gcc > env: > - - CONFIG="--arch=i386 --cross-prefix=i686-elf- > - --getopt=/usr/local/opt/gnu-getopt/bin/getopt" > + - CONFIG="--arch=i386 --cross-prefix=i686-elf-" > - BUILD_DIR="build" > - TESTS="cmpxchg8b vmexit_cpuid vmexit_mov_from_cr8 vmexit_mov_to_cr8 > vmexit_inl_pmtimer vmexit_ipi vmexit_ipi_halt > @@ -158,6 +157,7 @@ jobs: > vmexit_tscdeadline_immed eventinj port80 setjmp tsc > taskswitch umip" > - ACCEL="tcg" > + - PATH="/usr/local/opt/gnu-getopt/bin:$PATH" > > before_script: > - if [ "$ACCEL" = "kvm" ]; then > -- > 2.18.2 > Thanks, Thomas!
diff --git a/.travis.yml b/.travis.yml index ae4ed08..2e5ae41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,8 +128,7 @@ jobs: - qemu - x86_64-elf-gcc env: - - CONFIG="--cross-prefix=x86_64-elf- - --getopt=/usr/local/opt/gnu-getopt/bin/getopt" + - CONFIG="--cross-prefix=x86_64-elf-" - BUILD_DIR="build" - TESTS="ioapic-split smptest smptest3 vmexit_cpuid vmexit_mov_from_cr8 vmexit_mov_to_cr8 vmexit_inl_pmtimer vmexit_ipi vmexit_ipi_halt @@ -137,6 +136,7 @@ jobs: vmexit_tscdeadline_immed eventinj msr port80 setjmp syscall tsc rmap_chain umip intel_iommu" - ACCEL="tcg" + - PATH="/usr/local/opt/gnu-getopt/bin:$PATH" - os: osx osx_image: xcode11.6 @@ -149,8 +149,7 @@ jobs: - qemu - i686-elf-gcc env: - - CONFIG="--arch=i386 --cross-prefix=i686-elf- - --getopt=/usr/local/opt/gnu-getopt/bin/getopt" + - CONFIG="--arch=i386 --cross-prefix=i686-elf-" - BUILD_DIR="build" - TESTS="cmpxchg8b vmexit_cpuid vmexit_mov_from_cr8 vmexit_mov_to_cr8 vmexit_inl_pmtimer vmexit_ipi vmexit_ipi_halt @@ -158,6 +157,7 @@ jobs: vmexit_tscdeadline_immed eventinj port80 setjmp tsc taskswitch umip" - ACCEL="tcg" + - PATH="/usr/local/opt/gnu-getopt/bin:$PATH" before_script: - if [ "$ACCEL" = "kvm" ]; then
The enhanced getopt is now not selected with a configure switch anymore, but by setting the PATH to the right location. Signed-off-by: Thomas Huth <thuth@redhat.com> --- This fixes the new macOS build jobs on Travis : https://travis-ci.com/github/huth/kvm-unit-tests/builds/186146708 .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)