Skip to contentSkip to conversation

travis.yml: Fix the getopt problem

PATCH In review Thomas Huth 3 participants 5 messages Sep 23, 2020 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 travis.yml: Fix the getopt problem

The enhanced getopt is now not selected with a configure switch anymore, but by setting the PATH to the right location.

---
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(-)
.travis.yml +4 -4
index ae4ed08..2e5ae41 100644
@@ -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
Signature · 1 line
2.18.2
maintainer
#1 lore raw
Quoted 10 lines · Thomas Huth

The enhanced getopt is now not selected with a configure switch anymore, but by setting the PATH to the right location.

---
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

Quoted 41 lines
.travis.yml +4 -4
index ae4ed08..2e5ae41 100644
@@ -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 lore raw
Quoted 9 lines · Paolo Bonzini
Quoted 8 lines · Thomas Huth

The enhanced getopt is now not selected with a configure switch anymore, but by setting the PATH to the right location.

---
This fixes the new macOS build jobs on Travis :
https://travis-ci.com/github/huth/kvm-unit-tests/builds/186146708

Quoted 6 lines
Quoted 2 lines
 .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

maintainer
#3 lore raw
Quoted 13 lines · Thomas Huth
Quoted 12 lines · Paolo Bonzini
Quoted 10 lines · Thomas Huth

The enhanced getopt is now not selected with a configure switch anymore, but by setting the PATH to the right location.

---
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(-)
Quoted 6 lines
Quoted 3 lines

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

#4 lore raw
In reply to Thomas Huth
Quoted 54 lines · Thomas Huth

The enhanced getopt is now not selected with a configure switch anymore, but by setting the PATH to the right location.

---
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(-)
.travis.yml +4 -4
index ae4ed08..2e5ae41 100644
@@ -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
Signature · 1 line
2.18.2

Thanks, Thomas!