Skip to content

Commit 6e14ef8

Browse files
jviottijviotti
authored
Get rid of sandbox manifest files (#648)
Signed-off-by: Juan Cruz Viotti <[email protected]>
1 parent 26a47ed commit 6e14ef8

24 files changed

+1409
-9468
lines changed

‎Makefile‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,12 @@ sandbox-index: compile
9393
$(PREFIX)/bin/sourcemeta-one-index \
9494
$(SANDBOX)/one-$(SANDBOX_CONFIGURATION)-$(EDITION).json \
9595
$(OUTPUT)/sandbox --url $(SANDBOX_URL) --profile
96-
./test/sandbox/manifest-check.sh $(OUTPUT)/sandbox \
97-
$(SANDBOX)/manifest-$(SANDBOX_CONFIGURATION)-$(EDITION).txt
9896

9997
.PHONY: sandbox
10098
sandbox: sandbox-index
10199
$(PREFIX)/bin/sourcemeta-one-server \
102100
$(OUTPUT)/sandbox $(SANDBOX_PORT)
103101

104-
.PHONY: sandbox-manifest-refresh
105-
sandbox-manifest-refresh: configure compile
106-
$(CMAKE) -E rm -R -f build/sandbox && $(MAKE) configure compile sandbox-index ENTERPRISE=ON SANDBOX_CONFIGURATION=empty || true
107-
$(CMAKE) -E rm -R -f build/sandbox && $(MAKE) configure compile sandbox-index ENTERPRISE=ON SANDBOX_CONFIGURATION=headless || true
108-
$(CMAKE) -E rm -R -f build/sandbox && $(MAKE) configure compile sandbox-index ENTERPRISE=ON SANDBOX_CONFIGURATION=html || true
109-
$(CMAKE) -E rm -R -f build/sandbox && $(MAKE) configure compile sandbox-index ENTERPRISE=OFF SANDBOX_CONFIGURATION=empty || true
110-
$(CMAKE) -E rm -R -f build/sandbox && $(MAKE) configure compile sandbox-index ENTERPRISE=OFF SANDBOX_CONFIGURATION=headless || true
111-
$(CMAKE) -E rm -R -f build/sandbox && $(MAKE) configure compile sandbox-index ENTERPRISE=OFF SANDBOX_CONFIGURATION=html || true
112-
113102
.PHONY: docker
114103
docker: $(DOCKERFILE)
115104
$(DOCKER) build --tag one . --file $< --progress plain \

‎test/cli/CMakeLists.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,21 @@ if(ONE_INDEX)
3333
sourcemeta_one_test_cli(common index configuration-long)
3434
sourcemeta_one_test_cli(common index configuration-short)
3535
sourcemeta_one_test_cli(common index no-base-uri)
36+
sourcemeta_one_test_cli(common index manifest-empty)
37+
sourcemeta_one_test_cli(common index manifest-headless)
38+
sourcemeta_one_test_cli(common index manifest-default)
39+
sourcemeta_one_test_cli(common index version-path)
40+
sourcemeta_one_test_cli(common index schema-extension)
41+
sourcemeta_one_test_cli(common index version-filename)
42+
sourcemeta_one_test_cli(common index index-html-filename)
43+
sourcemeta_one_test_cli(common index camelcase-filename)
44+
sourcemeta_one_test_cli(common index file-and-directory-clash)
45+
sourcemeta_one_test_cli(common index yaml-schemas)
46+
sourcemeta_one_test_cli(common index period-filename)
47+
sourcemeta_one_test_cli(common index no-evaluate)
48+
sourcemeta_one_test_cli(common index no-id)
49+
sourcemeta_one_test_cli(common index encoded-percentage)
50+
sourcemeta_one_test_cli(common index string-directory-overlap)
3651

3752
if(ONE_ENTERPRISE)
3853
sourcemeta_one_test_cli(enterprise index no-options)

‎test/cli/index/common/camelcase-filename.sh‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
#!/bin/sh
2+
3+
set -o errexit
4+
set -o nounset
5+
6+
TMP="$(mktemp -d)"
7+
clean() { rm -rf "$TMP"; }
8+
trap clean EXIT
9+
10+
mkdir "$TMP/schemas"
11+
12+
cat << 'EOF' > "$TMP/schemas/CamelCase.json"
13+
{
14+
"$schema": "https://json-schema.org/draft/2020-12/schema",
15+
"$id": "https://example.com/CamelCase.json"
16+
}
17+
EOF
18+
19+
cat << EOF > "$TMP/one.json"
20+
{
21+
"url": "http://localhost:8000",
22+
"html": false,
23+
"contents": {
24+
"example": {
25+
"baseUri": "https://example.com",
26+
"path": "./schemas"
27+
}
28+
}
29+
}
30+
EOF
31+
32+
"$1" "$TMP/one.json" "$TMP/output"
33+
34+
cd "$TMP/output"
35+
find . -mindepth 1 | LC_ALL=C sort > "$TMP/manifest.txt"
36+
cd - > /dev/null
37+
38+
cat << 'EOF' > "$TMP/expected.txt"
39+
./configuration.json
40+
./dependency-tree.metapack
41+
./dependency-tree.metapack.deps
42+
./explorer
43+
./explorer/%
44+
./explorer/%/directory.metapack
45+
./explorer/%/directory.metapack.deps
46+
./explorer/%/search.metapack
47+
./explorer/%/search.metapack.deps
48+
./explorer/example
49+
./explorer/example/%
50+
./explorer/example/%/directory.metapack
51+
./explorer/example/%/directory.metapack.deps
52+
./explorer/example/camelcase
53+
./explorer/example/camelcase/%
54+
./explorer/example/camelcase/%/schema.metapack
55+
./explorer/example/camelcase/%/schema.metapack.deps
56+
./routes.bin
57+
./routes.bin.deps
58+
./schemas
59+
./schemas/example
60+
./schemas/example/camelcase
61+
./schemas/example/camelcase/%
62+
./schemas/example/camelcase/%/blaze-exhaustive.metapack
63+
./schemas/example/camelcase/%/blaze-exhaustive.metapack.deps
64+
./schemas/example/camelcase/%/blaze-fast.metapack
65+
./schemas/example/camelcase/%/blaze-fast.metapack.deps
66+
./schemas/example/camelcase/%/bundle.metapack
67+
./schemas/example/camelcase/%/bundle.metapack.deps
68+
./schemas/example/camelcase/%/dependencies.metapack
69+
./schemas/example/camelcase/%/dependencies.metapack.deps
70+
./schemas/example/camelcase/%/dependents.metapack
71+
./schemas/example/camelcase/%/dependents.metapack.deps
72+
./schemas/example/camelcase/%/editor.metapack
73+
./schemas/example/camelcase/%/editor.metapack.deps
74+
./schemas/example/camelcase/%/health.metapack
75+
./schemas/example/camelcase/%/health.metapack.deps
76+
./schemas/example/camelcase/%/locations.metapack
77+
./schemas/example/camelcase/%/locations.metapack.deps
78+
./schemas/example/camelcase/%/positions.metapack
79+
./schemas/example/camelcase/%/positions.metapack.deps
80+
./schemas/example/camelcase/%/schema.metapack
81+
./schemas/example/camelcase/%/schema.metapack.deps
82+
./schemas/example/camelcase/%/stats.metapack
83+
./schemas/example/camelcase/%/stats.metapack.deps
84+
./version.json
85+
EOF
86+
87+
diff "$TMP/manifest.txt" "$TMP/expected.txt"

‎test/cli/index/common/encoded-percentage.sh‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
#!/bin/sh
2+
3+
set -o errexit
4+
set -o nounset
5+
6+
TMP="$(mktemp -d)"
7+
clean() { rm -rf "$TMP"; }
8+
trap clean EXIT
9+
10+
mkdir "$TMP/schemas"
11+
12+
cat << 'EOF' > "$TMP/schemas/test.json"
13+
{
14+
"$schema": "https://json-schema.org/draft/2020-12/schema",
15+
"$id": "https://example.com/%25/test"
16+
}
17+
EOF
18+
19+
cat << EOF > "$TMP/one.json"
20+
{
21+
"url": "http://localhost:8000",
22+
"html": false,
23+
"contents": {
24+
"example": {
25+
"baseUri": "https://example.com",
26+
"path": "./schemas"
27+
}
28+
}
29+
}
30+
EOF
31+
32+
"$1" "$TMP/one.json" "$TMP/output"
33+
34+
cd "$TMP/output"
35+
find . -mindepth 1 | LC_ALL=C sort > "$TMP/manifest.txt"
36+
cd - > /dev/null
37+
38+
cat << 'EOF' > "$TMP/expected.txt"
39+
./configuration.json
40+
./dependency-tree.metapack
41+
./dependency-tree.metapack.deps
42+
./explorer
43+
./explorer/%
44+
./explorer/%/directory.metapack
45+
./explorer/%/directory.metapack.deps
46+
./explorer/%/search.metapack
47+
./explorer/%/search.metapack.deps
48+
./explorer/example
49+
./explorer/example/%
50+
./explorer/example/%/directory.metapack
51+
./explorer/example/%/directory.metapack.deps
52+
./explorer/example/%25
53+
./explorer/example/%25/%
54+
./explorer/example/%25/%/directory.metapack
55+
./explorer/example/%25/%/directory.metapack.deps
56+
./explorer/example/%25/test
57+
./explorer/example/%25/test/%
58+
./explorer/example/%25/test/%/schema.metapack
59+
./explorer/example/%25/test/%/schema.metapack.deps
60+
./routes.bin
61+
./routes.bin.deps
62+
./schemas
63+
./schemas/example
64+
./schemas/example/%25
65+
./schemas/example/%25/test
66+
./schemas/example/%25/test/%
67+
./schemas/example/%25/test/%/blaze-exhaustive.metapack
68+
./schemas/example/%25/test/%/blaze-exhaustive.metapack.deps
69+
./schemas/example/%25/test/%/blaze-fast.metapack
70+
./schemas/example/%25/test/%/blaze-fast.metapack.deps
71+
./schemas/example/%25/test/%/bundle.metapack
72+
./schemas/example/%25/test/%/bundle.metapack.deps
73+
./schemas/example/%25/test/%/dependencies.metapack
74+
./schemas/example/%25/test/%/dependencies.metapack.deps
75+
./schemas/example/%25/test/%/dependents.metapack
76+
./schemas/example/%25/test/%/dependents.metapack.deps
77+
./schemas/example/%25/test/%/editor.metapack
78+
./schemas/example/%25/test/%/editor.metapack.deps
79+
./schemas/example/%25/test/%/health.metapack
80+
./schemas/example/%25/test/%/health.metapack.deps
81+
./schemas/example/%25/test/%/locations.metapack
82+
./schemas/example/%25/test/%/locations.metapack.deps
83+
./schemas/example/%25/test/%/positions.metapack
84+
./schemas/example/%25/test/%/positions.metapack.deps
85+
./schemas/example/%25/test/%/schema.metapack
86+
./schemas/example/%25/test/%/schema.metapack.deps
87+
./schemas/example/%25/test/%/stats.metapack
88+
./schemas/example/%25/test/%/stats.metapack.deps
89+
./version.json
90+
EOF
91+
92+
diff "$TMP/manifest.txt" "$TMP/expected.txt"

‎test/cli/index/common/file-and-directory-clash.sh‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
#!/bin/sh
2+
3+
set -o errexit
4+
set -o nounset
5+
6+
TMP="$(mktemp -d)"
7+
clean() { rm -rf "$TMP"; }
8+
trap clean EXIT
9+
10+
mkdir -p "$TMP/schemas/foo"
11+
12+
cat << 'EOF' > "$TMP/schemas/foo.json"
13+
{
14+
"$schema": "https://json-schema.org/draft/2020-12/schema",
15+
"$id": "https://example.com/foo"
16+
}
17+
EOF
18+
19+
cat << 'EOF' > "$TMP/schemas/foo/bar.json"
20+
{
21+
"$schema": "https://json-schema.org/draft/2020-12/schema",
22+
"$id": "https://example.com/foo/bar"
23+
}
24+
EOF
25+
26+
cat << EOF > "$TMP/one.json"
27+
{
28+
"url": "http://localhost:8000",
29+
"html": false,
30+
"contents": {
31+
"example": {
32+
"baseUri": "https://example.com",
33+
"path": "./schemas"
34+
}
35+
}
36+
}
37+
EOF
38+
39+
"$1" "$TMP/one.json" "$TMP/output"
40+
41+
cd "$TMP/output"
42+
find . -mindepth 1 | LC_ALL=C sort > "$TMP/manifest.txt"
43+
cd - > /dev/null
44+
45+
cat << 'EOF' > "$TMP/expected.txt"
46+
./configuration.json
47+
./dependency-tree.metapack
48+
./dependency-tree.metapack.deps
49+
./explorer
50+
./explorer/%
51+
./explorer/%/directory.metapack
52+
./explorer/%/directory.metapack.deps
53+
./explorer/%/search.metapack
54+
./explorer/%/search.metapack.deps
55+
./explorer/example
56+
./explorer/example/%
57+
./explorer/example/%/directory.metapack
58+
./explorer/example/%/directory.metapack.deps
59+
./explorer/example/foo
60+
./explorer/example/foo/%
61+
./explorer/example/foo/%/directory.metapack
62+
./explorer/example/foo/%/directory.metapack.deps
63+
./explorer/example/foo/%/schema.metapack
64+
./explorer/example/foo/%/schema.metapack.deps
65+
./explorer/example/foo/bar
66+
./explorer/example/foo/bar/%
67+
./explorer/example/foo/bar/%/schema.metapack
68+
./explorer/example/foo/bar/%/schema.metapack.deps
69+
./routes.bin
70+
./routes.bin.deps
71+
./schemas
72+
./schemas/example
73+
./schemas/example/foo
74+
./schemas/example/foo/%
75+
./schemas/example/foo/%/blaze-exhaustive.metapack
76+
./schemas/example/foo/%/blaze-exhaustive.metapack.deps
77+
./schemas/example/foo/%/blaze-fast.metapack
78+
./schemas/example/foo/%/blaze-fast.metapack.deps
79+
./schemas/example/foo/%/bundle.metapack
80+
./schemas/example/foo/%/bundle.metapack.deps
81+
./schemas/example/foo/%/dependencies.metapack
82+
./schemas/example/foo/%/dependencies.metapack.deps
83+
./schemas/example/foo/%/dependents.metapack
84+
./schemas/example/foo/%/dependents.metapack.deps
85+
./schemas/example/foo/%/editor.metapack
86+
./schemas/example/foo/%/editor.metapack.deps
87+
./schemas/example/foo/%/health.metapack
88+
./schemas/example/foo/%/health.metapack.deps
89+
./schemas/example/foo/%/locations.metapack
90+
./schemas/example/foo/%/locations.metapack.deps
91+
./schemas/example/foo/%/positions.metapack
92+
./schemas/example/foo/%/positions.metapack.deps
93+
./schemas/example/foo/%/schema.metapack
94+
./schemas/example/foo/%/schema.metapack.deps
95+
./schemas/example/foo/%/stats.metapack
96+
./schemas/example/foo/%/stats.metapack.deps
97+
./schemas/example/foo/bar
98+
./schemas/example/foo/bar/%
99+
./schemas/example/foo/bar/%/blaze-exhaustive.metapack
100+
./schemas/example/foo/bar/%/blaze-exhaustive.metapack.deps
101+
./schemas/example/foo/bar/%/blaze-fast.metapack
102+
./schemas/example/foo/bar/%/blaze-fast.metapack.deps
103+
./schemas/example/foo/bar/%/bundle.metapack
104+
./schemas/example/foo/bar/%/bundle.metapack.deps
105+
./schemas/example/foo/bar/%/dependencies.metapack
106+
./schemas/example/foo/bar/%/dependencies.metapack.deps
107+
./schemas/example/foo/bar/%/dependents.metapack
108+
./schemas/example/foo/bar/%/dependents.metapack.deps
109+
./schemas/example/foo/bar/%/editor.metapack
110+
./schemas/example/foo/bar/%/editor.metapack.deps
111+
./schemas/example/foo/bar/%/health.metapack
112+
./schemas/example/foo/bar/%/health.metapack.deps
113+
./schemas/example/foo/bar/%/locations.metapack
114+
./schemas/example/foo/bar/%/locations.metapack.deps
115+
./schemas/example/foo/bar/%/positions.metapack
116+
./schemas/example/foo/bar/%/positions.metapack.deps
117+
./schemas/example/foo/bar/%/schema.metapack
118+
./schemas/example/foo/bar/%/schema.metapack.deps
119+
./schemas/example/foo/bar/%/stats.metapack
120+
./schemas/example/foo/bar/%/stats.metapack.deps
121+
./version.json
122+
EOF
123+
124+
diff "$TMP/manifest.txt" "$TMP/expected.txt"

0 commit comments

Comments
 (0)