eeva/gRPC-haskell
1
0
Fork 0
mirror of https://github.com/unclechu/gRPC-haskell.git synced 2024-11-05 10:49:42 +01:00
Code Issues Projects Releases Wiki Activity
gRPC-haskell/tests/tests.patch

43 lines
1.2 KiB
Diff
Raw Normal View History

Fix `grpc-haskell` tests for Nix (#80) This updates the `release.nix` to now correctly run the test suite. You can now build and test `grpc-haskell` by running: ``` $ nix-build -A grpc-haskell release.nix ``` ... and `nix-shell` has been updated, too, so that you can do `cabal` development inside of a `nix-shell` by running: ``` $ nix-shell -A grpc-haskell.env release.nix ``` For people who prefer to use `stack` you can still just build the `grpc` library by running: ``` $ nix-build -A grpc release.nix ``` ... then pass that library as input to `stack`
2016-12-12 19:40:23 +01:00
diff --git a/tests/simple-client.sh b/tests/simple-client.sh
index 8feb1f4..ca925b1 100755
--- a/tests/simple-client.sh
+++ b/tests/simple-client.sh
@@ -2,7 +2,7 @@
Update to gRPC 0.15 (#61) * update channel arg names, add compression level arg support, add compression level arg test * switch to temp test demonstrating bug in grpc 0.15.0 * memset op array to 0 * switch examples back * Switch to newer `grpc` and enable tests in `release.nix` * Split out `simple-server` test into separate shell script * Fix bash invocation * Add intermediate `./default-tests.nix` build * Add `tests.patch` to version control * Split `python` command into separate script * Provide `python` via `nix`
2016-08-05 18:29:20 +02:00
Fix `grpc-haskell` tests for Nix (#80) This updates the `release.nix` to now correctly run the test suite. You can now build and test `grpc-haskell` by running: ``` $ nix-build -A grpc-haskell release.nix ``` ... and `nix-shell` has been updated, too, so that you can do `cabal` development inside of a `nix-shell` by running: ``` $ nix-shell -A grpc-haskell.env release.nix ``` For people who prefer to use `stack` you can still just build the `grpc` library by running: ``` $ nix-build -A grpc release.nix ``` ... then pass that library as input to `stack`
2016-12-12 19:40:23 +01:00
hsTmpDir=$1
Update to gRPC 0.15 (#61) * update channel arg names, add compression level arg support, add compression level arg test * switch to temp test demonstrating bug in grpc 0.15.0 * memset op array to 0 * switch examples back * Switch to newer `grpc` and enable tests in `release.nix` * Split out `simple-server` test into separate shell script * Fix bash invocation * Add intermediate `./default-tests.nix` build * Add `tests.patch` to version control * Split `python` command into separate script * Provide `python` via `nix`
2016-08-05 18:29:20 +02:00
Fix `grpc-haskell` tests for Nix (#80) This updates the `release.nix` to now correctly run the test suite. You can now build and test `grpc-haskell` by running: ``` $ nix-build -A grpc-haskell release.nix ``` ... and `nix-shell` has been updated, too, so that you can do `cabal` development inside of a `nix-shell` by running: ``` $ nix-shell -A grpc-haskell.env release.nix ``` For people who prefer to use `stack` you can still just build the `grpc` library by running: ``` $ nix-build -A grpc release.nix ``` ... then pass that library as input to `stack`
2016-12-12 19:40:23 +01:00
-stack ghc -- \
+ghc \
--make \
-threaded \
-odir $hsTmpDir \
@@ -11,3 +11,7 @@ stack ghc -- \
$hsTmpDir/Simple.hs \
tests/TestClient.hs \
> /dev/null
+
+. @makeWrapper@/nix-support/setup-hook
+
+flagsBefore="" wrapProgram "${hsTmpDir}/simple-client" --prefix DYLD_LIBRARY_PATH : @grpc@/lib
Update to gRPC 0.15 (#61) * update channel arg names, add compression level arg support, add compression level arg test * switch to temp test demonstrating bug in grpc 0.15.0 * memset op array to 0 * switch examples back * Switch to newer `grpc` and enable tests in `release.nix` * Split out `simple-server` test into separate shell script * Fix bash invocation * Add intermediate `./default-tests.nix` build * Add `tests.patch` to version control * Split `python` command into separate script * Provide `python` via `nix`
2016-08-05 18:29:20 +02:00
diff --git a/tests/simple-server.sh b/tests/simple-server.sh
Fix `grpc-haskell` tests for Nix (#80) This updates the `release.nix` to now correctly run the test suite. You can now build and test `grpc-haskell` by running: ``` $ nix-build -A grpc-haskell release.nix ``` ... and `nix-shell` has been updated, too, so that you can do `cabal` development inside of a `nix-shell` by running: ``` $ nix-shell -A grpc-haskell.env release.nix ``` For people who prefer to use `stack` you can still just build the `grpc` library by running: ``` $ nix-build -A grpc release.nix ``` ... then pass that library as input to `stack`
2016-12-12 19:40:23 +01:00
index 37a0a63..eb37776 100755
Update to gRPC 0.15 (#61) * update channel arg names, add compression level arg support, add compression level arg test * switch to temp test demonstrating bug in grpc 0.15.0 * memset op array to 0 * switch examples back * Switch to newer `grpc` and enable tests in `release.nix` * Split out `simple-server` test into separate shell script * Fix bash invocation * Add intermediate `./default-tests.nix` build * Add `tests.patch` to version control * Split `python` command into separate script * Provide `python` via `nix`
2016-08-05 18:29:20 +02:00
--- a/tests/simple-server.sh
+++ b/tests/simple-server.sh
Fix `grpc-haskell` tests for Nix (#80) This updates the `release.nix` to now correctly run the test suite. You can now build and test `grpc-haskell` by running: ``` $ nix-build -A grpc-haskell release.nix ``` ... and `nix-shell` has been updated, too, so that you can do `cabal` development inside of a `nix-shell` by running: ``` $ nix-shell -A grpc-haskell.env release.nix ``` For people who prefer to use `stack` you can still just build the `grpc` library by running: ``` $ nix-build -A grpc release.nix ``` ... then pass that library as input to `stack`
2016-12-12 19:40:23 +01:00
@@ -2,7 +2,7 @@
Update to gRPC 0.15 (#61) * update channel arg names, add compression level arg support, add compression level arg test * switch to temp test demonstrating bug in grpc 0.15.0 * memset op array to 0 * switch examples back * Switch to newer `grpc` and enable tests in `release.nix` * Split out `simple-server` test into separate shell script * Fix bash invocation * Add intermediate `./default-tests.nix` build * Add `tests.patch` to version control * Split `python` command into separate script * Provide `python` via `nix`
2016-08-05 18:29:20 +02:00
hsTmpDir=$1
-stack ghc -- \
Fix `grpc-haskell` tests for Nix (#80) This updates the `release.nix` to now correctly run the test suite. You can now build and test `grpc-haskell` by running: ``` $ nix-build -A grpc-haskell release.nix ``` ... and `nix-shell` has been updated, too, so that you can do `cabal` development inside of a `nix-shell` by running: ``` $ nix-shell -A grpc-haskell.env release.nix ``` For people who prefer to use `stack` you can still just build the `grpc` library by running: ``` $ nix-build -A grpc release.nix ``` ... then pass that library as input to `stack`
2016-12-12 19:40:23 +01:00
+ghc \
Update to gRPC 0.15 (#61) * update channel arg names, add compression level arg support, add compression level arg test * switch to temp test demonstrating bug in grpc 0.15.0 * memset op array to 0 * switch examples back * Switch to newer `grpc` and enable tests in `release.nix` * Split out `simple-server` test into separate shell script * Fix bash invocation * Add intermediate `./default-tests.nix` build * Add `tests.patch` to version control * Split `python` command into separate script * Provide `python` via `nix`
2016-08-05 18:29:20 +02:00
--make \
-threaded \
-odir $hsTmpDir \
Fix `grpc-haskell` tests for Nix (#80) This updates the `release.nix` to now correctly run the test suite. You can now build and test `grpc-haskell` by running: ``` $ nix-build -A grpc-haskell release.nix ``` ... and `nix-shell` has been updated, too, so that you can do `cabal` development inside of a `nix-shell` by running: ``` $ nix-shell -A grpc-haskell.env release.nix ``` For people who prefer to use `stack` you can still just build the `grpc` library by running: ``` $ nix-build -A grpc release.nix ``` ... then pass that library as input to `stack`
2016-12-12 19:40:23 +01:00
@@ -11,3 +11,7 @@ stack ghc -- \
$hsTmpDir/Simple.hs \
tests/TestServer.hs \
> /dev/null
+
+. @makeWrapper@/nix-support/setup-hook
+
+flagsBefore="" wrapProgram "${hsTmpDir}/simple-server" --prefix DYLD_LIBRARY_PATH : @grpc@/lib
Reference in a new issue Copy permalink