11
22
3- # version 20211226
3+ # version 20220822
44
55
66bin ?= bin
@@ -25,26 +25,23 @@ Usage: \n\
2525 make build # build bin/lxroot \n\
2626 make unit # run the unit tests \n\
2727 make demo # run the interactive Alpine demo \n\
28- make demo3 # run the Arch Linux + Chromium demo \n\
2928 make static # build a statically linked lxroot \n\
3029 \n\
3130 make clean # delete bin/lxroot \n\
3231 make unit-clean # delete the unit test environment \n\
3332 make demo-clean # delete the demo environment \n\
34- make demo3-clean # delete the demo3 environment \n\
35- make static-clean # delete the static build environment \n\
36- \n\
37- make demo3-root # enter demo3 as (simulated) root "
33+ make static-clean # delete the static build environment"
3834
3935
4036$(bin ) /lxroot : $(deps ) $(bin ) /lxroot-unit
41- $(bin ) /lxroot-unit
37+ $(bin ) /lxroot-unit || \
38+ { /usr/bin/gdb -q -ex run $(bin)/lxroot-unit ; false ; }
4239 g++ -g $(gpp_opts) lxroot.cpp -o $@
4340
4441
45- # Note: Lxroot has two sets of unit tests.
46- # 1) unit.cpp compiles to bin/lxroot- unit and test various C++ functions.
47- # 2) aux/unit.sh tests the compiled bin/lxroot executable.
42+ # Note: There are two levels of unit tests:
43+ # 1) C++ unit tests in unit.cpp
44+ # 2) command line tests in aux/unit.sh
4845$(bin ) /lxroot-unit : $(deps )
4946 g++ -g $(gpp_opts ) unit.cpp -o $@
5047
@@ -97,23 +94,3 @@ demo-clean: clean
9794
9895static :
9996 bash aux/static.sh $(bin ) /lxroot $(static )
100-
101-
102- # demo 3 ----------------------------------------------------------- demo 3
103-
104-
105-
106-
107- demo3 : demo-prepare
108- /bin/sh aux/demo.sh demo3 $(demo )
109-
110-
111- demo3-root : demo-prepare
112- /bin/sh aux/demo.sh demo3 $(demo ) root
113-
114-
115- demo3-clean :
116- @ # paths hardcoded for safety
117- mkdir -p /tmp/lxroot-demo/demo3
118- chmod -R u+w /tmp/lxroot-demo/demo3
119- rm -rf /tmp/lxroot-demo/demo3
0 commit comments