Merge branch 'maint'

* maint:
  Skip ct_netconf tests if there is no crypto
  Migrate timers from test_server to ct interface
  Update tests to run with an oldshell emulator
  Move crypto check so that tc is skipped and not failed
  Update for new version of ppc compilation chain
  Verify that ebin folder of applications exists

Conflicts:
	lib/asn1/test/asn1_SUITE.erl
	lib/kernel/test/interactive_shell_SUITE.erl

1 files changed, 8 insertions, 8 deletions

diff --git a/xcomp/erl-xcomp-powerpc-dso-linux-gnu.conf b/xcomp/erl-xcomp-powerpc-dso-linux-gnu.conf
index 0e0c2f2337..c245b493a5 100644
--- a/xcomp/erl-xcomp-powerpc-dso-linux-gnu.conf
+++ b/xcomp/erl-xcomp-powerpc-dso-linux-gnu.conf
@@ -55,11 +55,11 @@ erl_xcomp_build=guess
 #   It does not have to be a full `CPU-VENDOR-OS' triplet, but can be. The
 #   full `CPU-VENDOR-OS' triplet will be created by
 #   `$ERL_TOP/erts/autoconf/config.sub $erl_xcomp_host'.
-erl_xcomp_host=powerpc-dso-linux-gnu
+erl_xcomp_host=powerpc-linux-gnu
 
 # * `erl_xcomp_configure_flags' - Extra configure flags to pass to the
 #   `configure' script.
-erl_xcomp_configure_flags=--without-termcap
+erl_xcomp_configure_flags="--without-termcap"
 
 ## -- Cross Compiler and Other Tools -------------------------------------------
 
@@ -70,7 +70,7 @@ erl_xcomp_configure_flags=--without-termcap
 ## All variables in this section can also be used when native compiling.
 
 # * `CC' - C compiler.
-CC=powerpc-dso-linux-gnu-gcc
+CC=powerpc-linux-gnu-gcc
 
 # * `CFLAGS' - C compiler flags.
 #CFLAGS=
@@ -90,13 +90,13 @@ CC=powerpc-dso-linux-gnu-gcc
 #CPPFLAGS=
 
 # * `CXX' - C++ compiler.
-CXX=powerpc-dso-linux-gnu-g++
+CXX=powerpc-linux-gnu-g++
 
 # * `CXXFLAGS' - C++ compiler flags.
 #CXXFLAGS=
 
 # * `LD' - Linker.
-LD=powerpc-dso-linux-gnu-ld
+LD=powerpc-linux-gnu-ld
 
 # * `LDFLAGS' - Linker flags.
 #LDFLAGS=
@@ -134,10 +134,10 @@ LD=powerpc-dso-linux-gnu-ld
 ## -- Other Tools --
 
 # * `RANLIB' - `ranlib' archive index tool.
-RANLIB=powerpc-dso-linux-gnu-ranlib
+RANLIB=powerpc-linux-gnu-ranlib
 
 # * `AR' - `ar' archiving tool.
-AR=powerpc-dso-linux-gnu-ar
+AR=powerpc-linux-gnu-ar
 
 # * `GETCONF' - `getconf' system configuration inspection tool. `getconf' is
 #   currently used for finding out large file support flags to use, and
@@ -178,7 +178,7 @@ erl_xcomp_sysroot="$DSO_SYSROOT_POWERPC"
 #   the target system must have a working `__after_morecore_hook' that can be
 #   used for tracking used `malloc()' implementations core memory usage.
 #   This is currently only used by unsupported features.
-erl_xcomp_after_morecore_hook=yes
+#erl_xcomp_after_morecore_hook=
 
 # * `erl_xcomp_bigendian' - `yes|no'. No default. If `yes', the target system
 #   must be big endian. If `no', little endian. This can often be