diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-05-31 00:16:07 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-31 00:26:03 -0400 |
| commit | d3656352eca7adbea2fa29994c01052834b28dc9 (patch) | |
| tree | 8c223cedff150e6d03b28aa4b6dbd3521adb5d41 /tests | |
| parent | gcc-config: fix install of reference progs (diff) | |
| download | gcc-config-d3656352eca7adbea2fa29994c01052834b28dc9.tar.gz gcc-config-d3656352eca7adbea2fa29994c01052834b28dc9.tar.bz2 gcc-config-d3656352eca7adbea2fa29994c01052834b28dc9.zip | |
gcc-config: fix old wrapper removal code path
While this code path won't fire on a sane setup, we still need it to
function on an insane one, so fix the old variable name (which has been
broken since it was originally added due to rewrites while it was under
initial development) so the stale wrapper actually gets removed.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'tests')
8 files changed, 16 insertions, 0 deletions
diff --git a/tests/rw-multi-native-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-4.7.0 b/tests/rw-multi-native-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-4.7.0 new file mode 100644 index 0000000..3f6c0dc --- /dev/null +++ b/tests/rw-multi-native-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-4.7.0 @@ -0,0 +1,5 @@ +LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0:/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/32" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.7.0/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.7.0/info" +STDCXX_INCDIR="g++-v4" +GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0" diff --git a/tests/rw-multi-native-configs/test.select-insane b/tests/rw-multi-native-configs/test.select-insane new file mode 100644 index 0000000..884598d --- /dev/null +++ b/tests/rw-multi-native-configs/test.select-insane @@ -0,0 +1,6 @@ +#!/bin/bash + +gcc-config -C 4.6.2 +touch usr/bin/gcj +gcc-config -C 4.7.0 +[[ ! -e usr/bin/gcj ]] diff --git a/tests/rw-multi-native-configs/test.select-insane.exp b/tests/rw-multi-native-configs/test.select-insane.exp new file mode 100644 index 0000000..0d7954d --- /dev/null +++ b/tests/rw-multi-native-configs/test.select-insane.exp @@ -0,0 +1,5 @@ + * Switching native-compiler to x86_64-pc-linux-gnu-4.6.2 ... [ ok ] + * Switching native-compiler to x86_64-pc-linux-gnu-4.7.0 ... + * double insanity with x86_64-pc-linux-gnu-gcj and @ROOT@//usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcj + * double insanity with gcj and @ROOT@//usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcj + [ ok ] diff --git a/tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/32/.keep b/tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/32/.keep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/32/.keep diff --git a/tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/libgcc.a b/tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/libgcc.a new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/libgcc.a diff --git a/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/cpp b/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/cpp new file mode 100755 index 0000000..e69de29 --- /dev/null +++ b/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/cpp diff --git a/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcc b/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcc new file mode 100755 index 0000000..e69de29 --- /dev/null +++ b/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcc diff --git a/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcj b/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcj new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcj |