aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-02-09 10:00:20 +0100
committerBjörn Gustavsson <[email protected]>2017-02-09 10:00:20 +0100
commit9d1fc57510b2a7c992ca160f9edf3de1e092a2e3 (patch)
tree1dfa36cb5da222fd778ce3da934a3b667d0954ad
parent24a1f4f2cc708d2dfd22b6390329abc96bff4f38 (diff)
parent03afef50394dbbaac9510835c8568b8ad19f9389 (diff)
downloadotp-9d1fc57510b2a7c992ca160f9edf3de1e092a2e3.tar.gz
otp-9d1fc57510b2a7c992ca160f9edf3de1e092a2e3.tar.bz2
otp-9d1fc57510b2a7c992ca160f9edf3de1e092a2e3.zip
Merge branch 'maint'
* maint: Reduce size of the log file for Travis CI Include more otp_SUITE tests cases in the smoke test
-rw-r--r--.travis.yml2
-rw-r--r--erts/test/system_smoke.spec7
-rwxr-xr-xscripts/build-otp20
3 files changed, 27 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 42151a16d2..baa55b383d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ before_script:
- kerl_deactivate
script:
- - ./otp_build all -a
+ - ./scripts/build-otp
after_success:
- $ERL_TOP/bin/dialyzer --build_plt --apps asn1 compiler crypto dialyzer edoc erts et hipe inets kernel mnesia observer public_key runtime_tools snmp ssh ssl stdlib syntax_tools wx xmerl --statistics
diff --git a/erts/test/system_smoke.spec b/erts/test/system_smoke.spec
index 933d1ba22d..99092c1dab 100644
--- a/erts/test/system_smoke.spec
+++ b/erts/test/system_smoke.spec
@@ -1,3 +1,8 @@
{suites,"../system_test",[ethread_SUITE]}.
-{cases,"../system_test",otp_SUITE,[undefined_functions]}.
+{cases,"../system_test",otp_SUITE,
+ [undefined_functions,
+ deprecated_not_in_obsolete,
+ obsolete_but_not_deprecated,
+ call_to_size_1,
+ call_to_now_0]}.
{skip_cases,"../system_test",ethread_SUITE,[max_threads],"Skip"}.
diff --git a/scripts/build-otp b/scripts/build-otp
new file mode 100755
index 0000000000..388fa8c276
--- /dev/null
+++ b/scripts/build-otp
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+function do_and_log {
+ log="scripts/latest-log.$$"
+ echo -n "$1... "
+ if ./otp_build $2 $3 >$log 2>&1; then
+ echo "done."
+ else
+ echo "failed."
+ tail -n 200 $log
+ echo "*** Failed ***"
+ exit 1
+ fi
+}
+
+do_and_log "Autoconfing" autoconf
+do_and_log "Configuring" configure
+do_and_log "Building OTP" boot -a
+
+exit 0