Browse Source

Bugfixes for dist make target

Now we can run tests from the tarball generated by make dist
Yann Weber 7 years ago
parent
commit
c28fd07797

+ 3
- 4
Makefile.am View File

@@ -1,5 +1,5 @@
1 1
 SUBDIRS=lodel progs plugins
2
-EXTRA_DIST=doc
2
+EXTRA_DIST=doc plugins runtest install-tpl examples tests
3 3
 
4 4
 lodel2datadir=$(datadir)/lodel2
5 5
 lodel2_localstate_DATA =
@@ -28,11 +28,10 @@ dyncode: examples/em_test.pickle
28 28
 	$(python) scripts/refreshdyn.py examples/em_test.pickle $(dyncode_filename) && echo -e "\n\nCode generated in $(dyncode_filename)"
29 29
 
30 30
 # run tests
31
-tests:
31
+check:
32 32
 	./runtest -v
33 33
 
34
-check: tests
35
-checks: tests
34
+unittest: check
36 35
 
37 36
 #Cleaning documentation and dyncode
38 37
 clean-local: cleandoc

+ 1
- 1
README View File

@@ -33,7 +33,7 @@ Other make targets :
33 33
 	Run unit tests :
34 34
 		make check
35 35
 		#or
36
-		make tests
36
+		make unittest
37 37
 
38 38
 Lodel2 instance management utilities :
39 39
 	SLIM : Simple Lodel Instance Manager

install/Makefile → install-tpl/Makefile View File


install/conf.d/datasources.ini → install-tpl/conf.d/datasources.ini View File


install/conf.d/dummy_plugin.ini → install-tpl/conf.d/dummy_plugin.ini View File


install/conf.d/lodel2.ini → install-tpl/conf.d/lodel2.ini View File


install/conf.d/webui_plugin.ini → install-tpl/conf.d/webui_plugin.ini View File


install/loader.py → install-tpl/loader.py View File


install/lodel_admin.py → install-tpl/lodel_admin.py View File


+ 1
- 1
runtest View File

@@ -55,7 +55,7 @@ fi
55 55
 PYTHON='env python3'
56 56
 testdir=$(mktemp -d)
57 57
 rmdir $testdir
58
-./progs/create_instance test_instance $testdir ./install ./examples/em_file.pickle $(dirname $0)
58
+./progs/create_instance test_instance $testdir ./install-tpl ./examples/em_file.pickle $(dirname $0)
59 59
 cp -R examples $testdir
60 60
 cp -R tests $testdir
61 61
 cd $testdir

Loading…
Cancel
Save