Split flx-ido tests into a separate Makefile rule

Now "make test" only runs the basic tests, and the flx-ido tests are
run with "make test-with-flx". Both rules should be run for a full
test, to ensure that all functionality works both with and without
flx-ido loaded. There is a convenience rule "all-tests" for running
both.

.travis.yml

@@ -42,4 +42,6 @@ before_script:
 
 script:
   - make compile
-  - make test
+  # Don't send redundant coverage info
+  - UNDERCOVER_CONFIG='((:send-report nil))' make test
+  - make test-with-flx

Makefile

@@ -10,11 +10,14 @@ all: test
 # files. We run the tests first without loading flx-ido, and then with
 # it. We only send the coverage report when running the full test
 # suite.
-test:
-	cask clean-elc
-	UNDERCOVER_CONFIG='((:send-report nil))' cask exec buttercup -L . tests
+test: clean
+	cask exec buttercup -L . tests
+
+test-with-flx: clean
 	cask exec buttercup -L . tests tests-with-flx-ido
 
+all-tests: test test-with-flx
+
 compile: $(ELC_FILES)
 
 $(ELC_FILES): .compile.intermediate