Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gcc-config:master commit in: tests/rw-multi-native-configs/, ...
Date: Thu, 31 May 2012 04:32:00
Message-Id: 1338438396.e148d677d931e534bd0e2f40baa4d82f513d8d3b.vapier@gentoo
1 commit: e148d677d931e534bd0e2f40baa4d82f513d8d3b
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 31 04:26:36 2012 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Thu May 31 04:26:36 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git;a=commit;h=e148d677
7
8 tests: verify removal of wrappers between diff configs
9
10 If we switch from a gcc that supports fortran to one that doesn't, we
11 want to make sure to clean out the old wrappers. Add test cases to
12 verify those paths.
13
14 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
15
16 ---
17 tests/rw-multi-native-configs/test.select | 22 ++++++++++++++++++++--
18 1 files changed, 20 insertions(+), 2 deletions(-)
19
20 diff --git a/tests/rw-multi-native-configs/test.select b/tests/rw-multi-native-configs/test.select
21 index 5912d2c..c6d9daf 100644
22 --- a/tests/rw-multi-native-configs/test.select
23 +++ b/tests/rw-multi-native-configs/test.select
24 @@ -1,9 +1,27 @@
25 #!/bin/bash
26 +
27 +baseline=( {,${CHOST}-}{cpp,gcc} cc )
28 +gxx=( {,${CHOST}-}g++ )
29 +gfortran=( {,${CHOST}-}gfortran )
30 +
31 for (( i = 1; i < 4; ++i )) ; do
32 - rm -f usr/bin/*
33 gcc-config -C ${i} "$@" || exit 1
34 - for b in {,${CHOST}-}{cpp,gcc} cc ; do
35 +
36 + do_want=( "${baseline[@]}" )
37 + dont_want=( )
38 + case ${i} in
39 + 1) do_want+=( "${gfortran[@]}" )
40 + dont_want+=( "${gxx[@]}" ) ;;
41 + 2) do_want+=( "${gxx[@]}" )
42 + dont_want+=( "${gfortran[@]}" ) ;;
43 + 3) dont_want+=( "${gfortran[@]}" "${gxx[@]}" ) ;;
44 + esac
45 +
46 + for b in "${do_want[@]}" ; do
47 [[ -e usr/bin/${b} ]] || exit 1
48 done
49 + for b in "${dont_want[@]}" ; do
50 + [[ -e usr/bin/${b} ]] && exit 1
51 + done
52 [[ -e etc/env.d/04gcc-${CHOST} ]] || exit 1
53 done
54
55 diff --git a/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.0/gfortran b/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.0/gfortran
56 new file mode 100755
57 index 0000000..e69de29
58
59 diff --git a/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.1/g++ b/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.1/g++
60 new file mode 100755
61 index 0000000..e69de29