@@ -59,11 +59,15 @@ TESTS_LIB = os.path.join(ROOT, 'tests', 'lib', 'jibb.hoon')
5959
6060# Desks the repo builds, and the folders each is assembled from, in
6161# order. Every desk gets every package under vendor/. A folder is
62−# (repo folder, desk folder, folders left out).
62+# (repo folder, desk folder, folders and files left out). The test
63+# desk holds my-app's sources under /my-app, so tests read them there
64+# instead of keeping copies.
6365DESKS = {
6466 'my-app': [('jibb-dev', '', ['tests']), ('my-app', '', [])],
6567 'jibb': [('jibb', '', [])],
66− 'jibb-dev': [('jibb-dev', '', []), ('tests', 'tests', [])],
68+ 'jibb-dev': [('jibb-dev', '', []), ('tests', 'tests', []),
69+ ('my-app', 'my-app',
70+ ['desk.bill', 'desk.docket-0', 'sys.kelvin'])],
6771}
6872# The test desk has no sys.kelvin of its own; Clay refuses a commit
6973# without one, so it gets the %jibb desk's.
@@ -861,7 +865,7 @@ class Assembly:
861865 if fn.startswith('.'):
862866 continue
863867 rel = os.path.join(rel_dir, fn)
864− if drop and drop(rel):
868+ if rel in skip or (drop and drop(rel)):
865869 continue
866870 desk_rel = os.path.join(into, rel) if into else rel
867871 with open(os.path.join(dirpath, fn), 'rb') as f:
@@ -903,7 +907,11 @@ def assemble(desk, lib=None, golden=None):
903907 (isolated and rel.startswith('lib' + os.sep) and
904908 rel.endswith('.hoon')))
905909 if os.path.isdir(golden):
906− a.add_tree(golden, os.path.join('tests', 'golden'))
910+ # A case file that links to a file the desk already
911+ # holds, such as one of my-app's, is read from there.
912+ a.add_tree(golden, os.path.join('tests', 'golden'),
913+ drop=lambda rel: linked_desk_path(
914+ desk, os.path.join(golden, rel)) is not None)
907915 a.add(os.path.join('tests', 'lib', 'jibb.hoon'),
908916 generate_tests(golden).encode(),
909917 'tools/ship gen-tests --golden %s' % show(golden))
@@ -921,6 +929,30 @@ def assemble(desk, lib=None, golden=None):
921929 return a
922930
923931
932+def linked_desk_path(desk, path):
933+ """The desk path of the file a symlink names, when the desk holds
934+ that file through another of its folders, or None."""
935+ if not os.path.islink(path):
936+ return None
937+ real = os.path.realpath(path)
938+ for folder, into, skip in DESKS[desk]:
939+ if folder == 'tests':
940+ continue
941+ rel = os.path.relpath(real, os.path.realpath(os.path.join(ROOT, folder)))
942+ if rel.startswith('..') or any(rel == s or rel.startswith(s + os.sep)
943+ for s in skip):
944+ continue
945+ return os.path.join(into, rel) if into else rel
946+ return None
947+
948+
949+def clay_file(desk, path, default):
950+ """How a generated /* names a golden case file: by the desk path
951+ of the file it links to, as linked_desk_path finds it, or default."""
952+ rel = linked_desk_path(desk, path)
953+ return '/' + '/'.join(clay_path(rel)) if rel is not None else default
954+
955+
924956def check_assembly(a):
925957 problems = []
926958 for rel in sorted(a.files):
@@ -956,6 +988,7 @@ TESTS_HEADER = """\
956988:: Each file holds the output plus one newline. An expect-types: line
957989:: or types.txt opts a case into golden-types and its types.txt output.
958990:: Files come in through /*; a missing expected output fails its case.
991+:: A case file that links to one of my-app's is read from /my-app.
959992:: tools/ship test syncs the desk and runs -test /=jibb-dev=/tests.
960993::
961994:: The .txt files reach Clay through the %txt mark, as lines, so the
@@ -1093,7 +1126,9 @@ def generate_tests(golden):
10931126 for i, ((name, folder), arm) in enumerate(
10941127 zip(cases, arm_names([c[0] for c in cases])), 1):
10951128 base = '/tests/golden/%s' % name
1096− lines.append('/* src-%d %%jibb %s/source/jibb' % (i, base))
1129+ lines.append('/* src-%d %%jibb %s' % (i, clay_file(
1130+ 'jibb-dev', os.path.join(folder, 'source.jibb'),
1131+ '%s/source/jibb' % base)))
10971132 # a knot literal: a case's name may hold . and _, which a
10981133 # path literal in Hoon can't, though /* takes them
10991134 try:
@@ -1117,10 +1152,10 @@ def generate_tests(golden):
11171152 args.append('~')
11181153 call = '(%s %s)' % ('check-at' if logical else 'check', ' '.join(args))
11191154 module_fixtures = []
1120− for j, (module, at, _) in enumerate(modules, 1):
1155+ for j, (module, at, fixture) in enumerate(modules, 1):
11211156 face = 'mod-%d-%d' % (i, j)
1122− lines.append('/* %s %%jibb %s/modules%s/jibb' %
1123− (face, base, module[:-5]))
1157+ lines.append('/* %s %%jibb %s' % (face, clay_file(
1158+ 'jibb-dev', fixture, '%s/modules%s/jibb' % (base, module[:-5]))))
11241159 module_fixtures.append('[%s %s %s]' % (hoon_cord(module.encode()), at, face))
11251160 if golden_case.wants_types(folder):
11261161 if os.path.isfile(os.path.join(folder, 'types.txt')):
@@ -2286,9 +2321,10 @@ EPILOG = """\
22862321desks:
22872322 my-app vendor/* + jibb-dev (without any tests/) + my-app
22882323 jibb vendor/* + jibb
2289− jibb-dev vendor/* + jibb-dev + tests, the test desk: tests/golden from
2290− --golden, tests/lib/jibb.hoon generated from it, and sys.kelvin
2291− from jibb/
2324+ jibb-dev vendor/* + jibb-dev + tests + my-app (under /my-app, without
2325+ its desk files), the test desk: tests/golden from --golden,
2326+ less the case files that link to my-app, tests/lib/jibb.hoon
2327+ generated from it, and sys.kelvin from jibb/
22922328A sync creates the desk if it's missing (as |new-desk does), mounts it at
22932329<pier>/<desk>, makes the mount hold exactly the desk's files, runs
22942330|commit, and waits until the desk matches the repo, checking every file.