Skip to content

Commit

Permalink
make distcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
rescrv committed Jul 27, 2016
1 parent be76d41 commit 2aca740
Show file tree
Hide file tree
Showing 21 changed files with 59 additions and 22 deletions.
38 changes: 37 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,27 @@ pyx_verbose_0 = @echo " PYX " $@;

EXTRA_DIST =
EXTRA_DIST += README
EXTRA_DIST += CAVEATS
EXTRA_DIST += LICENSE
EXTRA_DIST += doc/format.txt
EXTRA_DIST += doc/tests.txt

include_HEADERS = macaroons.h

noinst_HEADERS = base64.h constants.h custom-config.h packet.h port.h
noinst_HEADERS =
noinst_HEADERS += base64.h
noinst_HEADERS += constants.h
noinst_HEADERS += custom-config.h
noinst_HEADERS += macaroons-inner.h
noinst_HEADERS += packet.h
noinst_HEADERS += port.h
noinst_HEADERS += sha256.h
noinst_HEADERS += slice.h
noinst_HEADERS += sysendian.h
noinst_HEADERS += tweetnacl.h
noinst_HEADERS += varint.h
noinst_HEADERS += v1.h
noinst_HEADERS += v2.h

lib_LTLIBRARIES = libmacaroons.la

Expand Down Expand Up @@ -123,6 +139,26 @@ macaroon_unit_test_stubs += test/unit/serialization_3.sh

TESTS += $(macaroon_unit_test_stubs)
check_SCRIPTS += $(macaroon_unit_test_stubs)
EXTRA_DIST += $(macaroon_unit_test_stubs)
EXTRA_DIST += test/unit/caveat_v1_1.vtest
EXTRA_DIST += test/unit/caveat_v1_2.vtest
EXTRA_DIST += test/unit/caveat_v1_3.vtest
EXTRA_DIST += test/unit/caveat_v1_4.vtest
EXTRA_DIST += test/unit/caveat_v1_5.vtest
EXTRA_DIST += test/unit/caveat_v1_6.vtest
EXTRA_DIST += test/unit/caveat_v2_1.vtest
EXTRA_DIST += test/unit/caveat_v2_2.vtest
EXTRA_DIST += test/unit/caveat_v2_3.vtest
EXTRA_DIST += test/unit/caveat_v2_4.vtest
EXTRA_DIST += test/unit/caveat_v2_5.vtest
EXTRA_DIST += test/unit/caveat_v2_6.vtest
EXTRA_DIST += test/unit/root_v1_1.vtest
EXTRA_DIST += test/unit/root_v1_2.vtest
EXTRA_DIST += test/unit/root_v2_1.vtest
EXTRA_DIST += test/unit/root_v2_2.vtest
EXTRA_DIST += test/unit/serialization_1
EXTRA_DIST += test/unit/serialization_2
EXTRA_DIST += test/unit/serialization_3

#################################### Python ####################################

Expand Down
5 changes: 3 additions & 2 deletions maint/generate-shell-stubs
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,18 @@ for x in glob.glob('test/unit/*.vtest'):
fname = x + '.sh'
f = open(fname, 'w')
f.write('''#!/bin/sh
exec macaroon-test-verifier < {0}
exec macaroon-test-verifier < "${{MACAROONS_SRCDIR}}/{0}"
'''.format(x))
f.flush()
f.close()
os.chmod(fname, stat.S_IRWXU)

for x in glob.glob('test/unit/serialization*'):
if x.endswith('.sh'): continue
fname = x + '.sh'
f = open(fname, 'w')
f.write('''#!/bin/sh
exec macaroon-test-serialization < {0}
exec macaroon-test-serialization < "${{MACAROONS_SRCDIR}}/{0}"
'''.format(x))
f.flush()
f.close()
Expand Down
2 changes: 1 addition & 1 deletion test/unit/caveat_v1_1.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v1_1.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v1_1.vtest"
2 changes: 1 addition & 1 deletion test/unit/caveat_v1_2.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v1_2.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v1_2.vtest"
2 changes: 1 addition & 1 deletion test/unit/caveat_v1_3.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v1_3.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v1_3.vtest"
2 changes: 1 addition & 1 deletion test/unit/caveat_v1_4.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v1_4.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v1_4.vtest"
2 changes: 1 addition & 1 deletion test/unit/caveat_v1_5.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v1_5.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v1_5.vtest"
2 changes: 1 addition & 1 deletion test/unit/caveat_v1_6.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v1_6.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v1_6.vtest"
2 changes: 1 addition & 1 deletion test/unit/caveat_v2_1.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v2_1.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v2_1.vtest"
2 changes: 1 addition & 1 deletion test/unit/caveat_v2_2.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v2_2.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v2_2.vtest"
2 changes: 1 addition & 1 deletion test/unit/caveat_v2_3.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v2_3.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v2_3.vtest"
2 changes: 1 addition & 1 deletion test/unit/caveat_v2_4.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v2_4.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v2_4.vtest"
2 changes: 1 addition & 1 deletion test/unit/caveat_v2_5.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v2_5.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v2_5.vtest"
2 changes: 1 addition & 1 deletion test/unit/caveat_v2_6.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/caveat_v2_6.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/caveat_v2_6.vtest"
2 changes: 1 addition & 1 deletion test/unit/root_v1_1.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/root_v1_1.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/root_v1_1.vtest"
2 changes: 1 addition & 1 deletion test/unit/root_v1_2.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/root_v1_2.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/root_v1_2.vtest"
2 changes: 1 addition & 1 deletion test/unit/root_v2_1.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/root_v2_1.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/root_v2_1.vtest"
2 changes: 1 addition & 1 deletion test/unit/root_v2_2.vtest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-verifier < test/unit/root_v2_2.vtest
exec macaroon-test-verifier < "${MACAROONS_SRCDIR}/test/unit/root_v2_2.vtest"
2 changes: 1 addition & 1 deletion test/unit/serialization_1.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-serialization < test/unit/serialization_1
exec macaroon-test-serialization < "${MACAROONS_SRCDIR}/test/unit/serialization_1"
2 changes: 1 addition & 1 deletion test/unit/serialization_2.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-serialization < test/unit/serialization_2
exec macaroon-test-serialization < "${MACAROONS_SRCDIR}/test/unit/serialization_2"
2 changes: 1 addition & 1 deletion test/unit/serialization_3.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
exec macaroon-test-serialization < test/unit/serialization_3
exec macaroon-test-serialization < "${MACAROONS_SRCDIR}/test/unit/serialization_3"

0 comments on commit 2aca740

Please sign in to comment.