From c20c79c29e1702b20508bc00e0a4e840b2faa77e Mon Sep 17 00:00:00 2001
From: Jiajie Chen <noc@jiegec.ac.cn>
Date: Wed, 27 Mar 2019 00:43:13 +0800
Subject: [PATCH] Merge targets in travis ci and fix typo in Makefile

---
 .travis.yml | 25 ++++---------------------
 Makefile    |  2 +-
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cab4816..19f7ee9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,30 +17,13 @@ os:
 
 env:
   matrix:
-    - ARCH="x86_64" SRC="ucore"
-    - ARCH="aarch64" SRC="ucore"
-    - ARCH="riscv32" SRC="ucore"
-    - ARCH="riscv64" SRC="ucore"
-    - ARCH="x86_64" SRC="rust"
-    - ARCH="aarch64" SRC="rust"
-    - ARCH="riscv32" SRC="rust"
-    - ARCH="riscv64" SRC="rust"
-    - ARCH="x86_64" SRC="biscuit"
-    - ARCH="aarch64" SRC="biscuit"
-    - ARCH="riscv64" SRC="biscuit"
-    - ARCH="x86_64" SRC="nginx"
-    - ARCH="aarch64" SRC="nginx"
-    - ARCH="riscv64" SRC="nginx"
-    - ARCH="x86_64" SRC="redis"
-    - ARCH="aarch64" SRC="redis"
-    - ARCH="riscv32" SRC="redis"
-
+    - ARCH="x86_64" SRC="all"
+    - ARCH="aarch64" SRC="all"
+    - ARCH="riscv32" SRC="all"
+    - ARCH="riscv64" SRC="all"
 
 allow_failures:
   matrix:
-    - env: ARCH="x86_64" SRC="redis" # unable to reproduce locally, weird..
-    - env: ARCH="aarch64" SRC="redis" # unable to reproduce locally, weird..
-    - env: ARCH="riscv32" SRC="redis" # unable to reproduce locally, weird..
     # too slow or homebrew too old
     - os: osx
 
diff --git a/Makefile b/Makefile
index e2af632..cf6ddb6 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ endif
 endif
 
 redis:
-ifneq ($(redis), on)
+ifeq ($(redis), on)
 ifneq ($(arch), riscv64)
 ifneq ($(shell uname), Darwin)
 	mkdir -p $(out_dir)