mirror of
https://github.com/NixOS/nix
synced 2025-07-07 14:21:48 +02:00
Put functional tests in tests/functional
I think it is bad for these reasons when `tests/` contains a mix of
functional and integration tests
- Concepts is harder to understand, the documentation makes a good
unit vs functional vs integration distinction, but when the
integration tests are just two subdirs within `tests/` this is not
clear.
- Source filtering in the `flake.nix` is more complex. We need to
filter out some of the dirs from `tests/`, rather than simply pick
the dirs we want and take all of them. This is a good sign the
structure of what we are trying to do is not matching the structure
of the files.
With this change we have a clean:
```shell-session
$ git show 'HEAD:tests'
tree HEAD:tests
functional/
installer/
nixos/
```
(cherry picked from commit 68c81c7375
)
This commit is contained in:
parent
7242521265
commit
30dcc19d1f
598 changed files with 93 additions and 93 deletions
43
tests/functional/lang/parse-okay-subversion.nix
Normal file
43
tests/functional/lang/parse-okay-subversion.nix
Normal file
|
@ -0,0 +1,43 @@
|
|||
{ localServer ? false
|
||||
, httpServer ? false
|
||||
, sslSupport ? false
|
||||
, pythonBindings ? false
|
||||
, javaSwigBindings ? false
|
||||
, javahlBindings ? false
|
||||
, stdenv, fetchurl
|
||||
, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null
|
||||
}:
|
||||
|
||||
assert expat != null;
|
||||
assert localServer -> db4 != null;
|
||||
assert httpServer -> httpd != null && httpd.expat == expat;
|
||||
assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
|
||||
assert pythonBindings -> swig != null && swig.pythonSupport;
|
||||
assert javaSwigBindings -> swig != null && swig.javaSupport;
|
||||
assert javahlBindings -> j2sdk != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "subversion-1.1.1";
|
||||
|
||||
builder = /foo/bar;
|
||||
src = fetchurl {
|
||||
url = http://subversion.tigris.org/tarballs/subversion-1.1.1.tar.bz2;
|
||||
md5 = "a180c3fe91680389c210c99def54d9e0";
|
||||
};
|
||||
|
||||
# This is a hopefully temporary fix for the problem that
|
||||
# libsvnjavahl.so isn't linked against libstdc++, which causes
|
||||
# loading the library into the JVM to fail.
|
||||
patches = if javahlBindings then [/javahl.patch] else [];
|
||||
|
||||
openssl = if sslSupport then openssl else null;
|
||||
httpd = if httpServer then httpd else null;
|
||||
db4 = if localServer then db4 else null;
|
||||
swig = if pythonBindings || javaSwigBindings then swig else null;
|
||||
python = if pythonBindings then swig.python else null;
|
||||
j2sdk = if javaSwigBindings then swig.j2sdk else
|
||||
if javahlBindings then j2sdk else null;
|
||||
|
||||
inherit expat localServer httpServer sslSupport
|
||||
pythonBindings javaSwigBindings javahlBindings;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue