4 files changed, 4 insertions, 20 deletions

diff --git a/.travis.yml b/.travis.yml
index 1123915a..d3c46d98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,7 @@ matrix:
     compiler: clang
     addons:
       apt: &apt-dependencies
-        sources:
-        - avsm
         packages:
-        - aspcud                # For Opam
         - libconfig-dev         # For tox-bootstrapd.
         - libcv-dev             # For av_test.
         - libhighgui-dev        # For av_test.
@@ -25,7 +22,6 @@ matrix:
         - libsndfile1-dev       # For av_test.
         - libgtest-dev          # For unit tests.
         - libvpx-dev            # For toxav.
-        - opam                  # For apidsl and Frama-C.
         - portaudio19-dev       # For av_test.
   - stage: "Stage 1"
     if: type IN (push, api, cron)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e438e221..1aee8017 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -399,16 +399,15 @@ set(TEST_TIMEOUT_SECONDS "" CACHE STRING "Limit runtime of each test to the numb
 
 option(FORMAT_TEST "Require the format_test to be executed; fail cmake if it can't" OFF)
 
-if(APIDSL AND ASTYLE)
+if(ASTYLE)
   add_test(
     NAME format_test
     COMMAND ${toxcore_SOURCE_DIR}/other/astyle/format-source
       "${toxcore_SOURCE_DIR}"
-      "${APIDSL}"
       "${ASTYLE}")
   set_tests_properties(format_test PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")
 elseif(FORMAT_TEST)
-  message(FATAL_ERROR "format_test can not be run, because either APIDSL (${APIDSL}) or ASTYLE (${ASTYLE}) could not be found")
+  message(FATAL_ERROR "format_test can not be run, because ASTYLE (${ASTYLE}) could not be found")
 endif()
 
 function(auto_test target)
diff --git a/other/astyle/format-source b/other/astyle/format-source
index cf190982..e558149a 100755
--- a/other/astyle/format-source
+++ b/other/astyle/format-source
@@ -3,8 +3,8 @@
 set -e
 
 SOURCE_DIR="$1"
-APIDSL="$2"
-ASTYLE="$3"
+ASTYLE="$2"
+APIDSL="$3"
 
 # Go to the source root.
 if [ -z "$SOURCE_DIR" ]; then
diff --git a/other/travis/toxcore-linux-install b/other/travis/toxcore-linux-install
index 502d3de7..3bf452f1 100755
--- a/other/travis/toxcore-linux-install
+++ b/other/travis/toxcore-linux-install
@@ -1,16 +1,5 @@
 #!/bin/sh
 
-# Set up opam.
-opam init -y
-eval `opam config env`
-
-# Install required opam packages.
-opam install -y ocamlfind ppx_deriving menhir
-
-# Build apidsl.
-git clone --depth=1 https://github.com/TokTok/apidsl ../apidsl
-make -C ../apidsl -j$NPROC
-
 # Install cpp-coveralls to upload test coverage results.
 pip install --user urllib3[secure] cpp-coveralls