script: remove script/integration

ttaylorr · ttaylorr · commit a4cc106eb3a4 · 2018-07-13T12:44:47.000-05:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -112,7 +112,7 @@ Before submitting changes, be sure to run the Go tests and the shell integration
 tests:
 
     $ script/test        # runs just the Go tests
-    $ script/integration # runs the shell tests in ./test
+    $ cd t && make test  # runs the shell tests in ./test
     $ script/cibuild     # runs everything, with verbose debug output
 
 ## Updating 3rd party packages
diff --git a/rpm/SPECS/git-lfs.spec b/rpm/SPECS/git-lfs.spec
@@ -68,7 +68,7 @@ export SKIPAPITESTCOMPILE=1
 pushd src/github.com/git-lfs/%{name}
   ./script/test
   go get github.com/ThomsonReutersEikon/go-ntlm/ntlm
-  ./script/integration
+  cd t && make test
 popd
 
 rmdir ${GIT_LFS_TEST_DIR}
diff --git a/script/integration b/script/integration
diff --git a/script/integration.go b/script/integration.go
diff --git a/script/script.go b/script/script.go
@@ -20,8 +20,6 @@ func main() {
 		mainBuild()
 	case "release":
 		mainRelease()
-	case "integration":
-		mainIntegration()
 	default:
 		log.Fatalln("Unknown command:", *SubCommand)
 	}
diff --git a/t/testhelpers.sh b/t/testhelpers.sh
@@ -313,9 +313,9 @@ wait_for_file() {
 
 # setup_remote_repo initializes a bare Git repository that is accessible through
 # the test Git server. The `pwd` is set to the repository's directory, in case
-# further commands need to be run. This server is running for every test in a
-# script/integration run, so every test file should setup its own remote
-# repository to avoid conflicts.
+# further commands need to be run. This server is running for every test in an
+# integration run, so every test file should setup its own remote repository to
+# avoid conflicts.
 #
 #   $ setup_remote_repo "some-name"
 #

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@ func main() {`
`20`	`20`	`mainBuild()`
`21`	`21`	`case "release":`
`22`	`22`	`mainRelease()`
`23`		`- case "integration":`
`24`		`- mainIntegration()`
`25`	`23`	`default:`
`26`	`24`	`log.Fatalln("Unknown command:", *SubCommand)`
`27`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -313,9 +313,9 @@ wait_for_file() {`
`313`	`313`
`314`	`314`	`# setup_remote_repo initializes a bare Git repository that is accessible through`
`315`	`315`	# the test Git server. The `pwd` is set to the repository's directory, in case
`316`		`-# further commands need to be run. This server is running for every test in a`
`317`		`-# script/integration run, so every test file should setup its own remote`
`318`		`-# repository to avoid conflicts.`
	`316`	`+# further commands need to be run. This server is running for every test in an`
	`317`	`+# integration run, so every test file should setup its own remote repository to`
	`318`	`+# avoid conflicts.`
`319`	`319`	`#`
`320`	`320`	`# $ setup_remote_repo "some-name"`
`321`	`321`	`#`