aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-07-13 13:37:25 +0200
committerLukas Larsson <[email protected]>2017-07-17 10:01:54 +0200
commitc19848f4f202637b5c92e8cff660dfa2b8ab6b1b (patch)
tree9be104b6b33432fe2f81bd1053c098a650a6f8ba
parenta497237907f2e4112f0c765718975165b6554795 (diff)
downloadotp-c19848f4f202637b5c92e8cff660dfa2b8ab6b1b.tar.gz
otp-c19848f4f202637b5c92e8cff660dfa2b8ab6b1b.tar.bz2
otp-c19848f4f202637b5c92e8cff660dfa2b8ab6b1b.zip
Don't build or test plain emu in travis any more
-rwxr-xr-xscripts/build-otp2
-rwxr-xr-xscripts/run-smoke-tests2
2 files changed, 1 insertions, 3 deletions
diff --git a/scripts/build-otp b/scripts/build-otp
index 92a866a0a9..92031c79c8 100755
--- a/scripts/build-otp
+++ b/scripts/build-otp
@@ -37,7 +37,7 @@ if [ ! -d "logs" ]; then
fi
do_and_log "Autoconfing" autoconf
-do_and_log "Configuring" configure --enable-plain-emulator
+do_and_log "Configuring" configure
do_and_log "Building OTP" boot -a
exit 0
diff --git a/scripts/run-smoke-tests b/scripts/run-smoke-tests
index 5a850c7107..b3d26f1fce 100755
--- a/scripts/run-smoke-tests
+++ b/scripts/run-smoke-tests
@@ -17,5 +17,3 @@ function run_smoke_tests {
}
run_smoke_tests
-ERL_FLAGS="-smp disable" run_smoke_tests
-