From 005cfca219e3784bedba436a124b712dd7120724 Mon Sep 17 00:00:00 2001
From: Tim Newsome <tim@sifive.com>
Date: Mon, 5 Nov 2018 11:50:09 -0800
Subject: [PATCH] Install patchutils for the build. (#321)

* Install patchutils for the build.

This contains filterdiff, which we need to check that our changes
conform to OpenOCD style.

Change-Id: Id522f4e62fee3efad4e0e00933abfeada9635624

* Fix paths for filterdiff line.

Change-Id: Ic50e13c7fe64e65b2d2af0260fb19c07a9f10e20

* Conform to OpenOCD style.

Change-Id: I51660d30404c0a625b58c9bed2d948695575e72e
---
 .travis.yml                  | 16 ++++++++++++----
 src/target/riscv/riscv-013.c |  5 ++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3691a1ce6..3749a8aed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,10 @@ matrix:
           env:
               - BUILD=x86_64-linux-gnu
               - EXECUTABLE=openocd
+          addons:
+              apt:
+                  packages:
+                      - patchutils
           compiler: gcc
 
         - os: linux
@@ -17,13 +21,17 @@ matrix:
           addons:
               apt:
                   packages:
-                      - gcc-multilib
+                      - gcc-multilib patchutils
           compiler: gcc
 
         - os: linux
           env:
               - BUILD=x86_64-linux-gnu
               - EXECUTABLE=openocd
+          addons:
+              apt:
+                  packages:
+                      - patchutils
           compiler: clang
 
         - os: linux
@@ -36,7 +44,7 @@ matrix:
           addons:
               apt:
                   packages:
-                      - gcc-multilib
+                      - gcc-multilib patchutils
 
         - os: linux
           env:
@@ -47,7 +55,7 @@ matrix:
           addons:
               apt:
                   packages:
-                      - binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686
+                      - binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 patchutils
 
 script:
     # Ideally we'd diff back to where we either branched off OpenOCD or master,
@@ -56,7 +64,7 @@ script:
     # so this should work fine most of the time, and be a lot better than not
     # checking at all.
     - git diff -U20 HEAD~40 |
-        filterdiff -x "src/jtag/drivers/libjaylink/*" -x "tools/git2cl/*" |
+        filterdiff -x "b/src/jtag/drivers/libjaylink/*" -x "b/tools/git2cl/*" |
         ./tools/scripts/checkpatch.pl --no-signoff -
     - ./bootstrap && ./configure --enable-remote-bitbang --enable-jtag_vpi $CONFIGURE_ARGS && make
     - file src/$EXECUTABLE
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index bc9085ecc..529fba73c 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -3292,7 +3292,7 @@ static int riscv013_test_sba_config_reg(struct target *target,
 		LOG_INFO("ALL TESTS PASSED");
 		return ERROR_OK;
 	} else {
-		LOG_ERROR("%d TESTS FAILED", tests_failed);	
+		LOG_ERROR("%d TESTS FAILED", tests_failed);
 		return ERROR_FAIL;
 	}
 
@@ -3369,9 +3369,8 @@ static int maybe_execute_fence_i(struct target *target)
 {
 	RISCV013_INFO(info);
 	RISCV_INFO(r);
-	if (info->progbufsize + r->impebreak >= 3) {
+	if (info->progbufsize + r->impebreak >= 3)
 		return execute_fence(target);
-	}
 	return ERROR_OK;
 }