1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
Where is this code going?
-------------------------
The basic idea is to reduce things to the point that a Makefile looks
something like:
PROGRAMS=foo
include ../../mk/program.mk
ifdef EXTRA_STUFF
LIBS+=-lextra
endif
Either subdirs.mk, program.mk, or library.mk gets included.
This means:
- the srcdir/objdir shuffle has to go
- all the flags get set up
- all the auto-dependency stuff is dealt with
- makefiles use a small well-defined set of flags
And a small set of well defined targets work:
- make (default to programs or all?)
- make install
- make clean
- make distclean?
TODO: a.k.a. what needs fixing
------------------------------
The following are quirks in the build system:
- merge config.mk and userlandcflags.mk; two types of flags are needed:
USERLAND_CFLAGS += -D ... - defined for all builds
<FEATURE>_LDFLAGS = ... - added as needed to an application's LDFLAGS
- build/install test applications at build/install time
stops tests needing to get to /source (the build tree) during
testing
- when fips, generate fipshmac checksums during install
- stop program.mk switching to $(builddir)
- recursive make targets should stick to $(srcdir); currently some
switch back to $(builddir) at the last moment (see above)
- remove the redundant prefix in -I${SRCDIR}${LIBRESWANSRCDIR}
- rename modobj to something more specific - like builddir
- unit tests under testing/ could do with their own unit-test.mk file;
grep for UNITTEST in testing's Makefile-s
- be more consistent with "=", ":=" and "?="; there's a meta issue
here - configuration files are included early leading to "?=" rather
than late
- run "make --warn-undefined-variables"
- do not generate the makefiles under $(OBJDIR); need to stop things
switching to that directory first
- eliminate Makefile.ver: this is really messy as scripts do all sorts
of weird and wonderful stuff with it.
- make building individual programs configurable
- add a minimal config for small systems
The following are quirks inside of pluto:
- log, as a separate line, the file's basename, line and function
The following are quirks with /testing:
- don't have /etc/ipsec.conf refer to /testing
- don't have tests run scripts in /testing
- run ../../../testing/guestbin/swan-init (a relative path within the
current test tree), and not /testing/guestbin/swan-init
- kvmrunner should write a marker at the start/end of each script and
when things are done - clean up "abort" magic
- kvmrunner should always format its output as <test>/OUTPUT
The following are quirks in the test infrastructure:
- move guest scripts from testing/pluto/bin to testing/guestbin; and
KVM scripts to testing/libvirt
- have *init.sh et.al. scripts always succeed. This means that
commands like ping that are expected to fail (demonstrating no
connectivity) will need a "!" prefix so the failure is success.
- simplify fips check
- swan-transmogrify runs chcon -R testing/pluto, it should only run
that over the current test directory
- simplify and speed up ping deadness check
|
