diff --git a/docker/organic_test/Dockerfile b/docker/organic_test/Dockerfile index 0ae74eb7..4fc9f81d 100644 --- a/docker/organic_test/Dockerfile +++ b/docker/organic_test/Dockerfile @@ -93,6 +93,10 @@ ARG WORG_PATH=/foreign_documents/worg ARG WORG_REPO=https://git.sr.ht/~bzg/worg RUN mkdir -p $WORG_PATH && git -C $WORG_PATH init --initial-branch=main && git -C $WORG_PATH remote add origin $WORG_REPO && git -C $WORG_PATH fetch origin $WORG_VERSION && git -C $WORG_PATH checkout FETCH_HEAD +ARG LITERATE_BUILD_EMACS_VERSION=e3ac1afe1e40af601be7af12c1d13d96308ab209 +ARG LITERATE_BUILD_EMACS_PATH=/foreign_documents/literate_build_emacs +ARG LITERATE_BUILD_EMACS_REPO=https://gitlab.com/spudlyo/orgdemo2.git +RUN mkdir -p $LITERATE_BUILD_EMACS_PATH && git -C $LITERATE_BUILD_EMACS_PATH init --initial-branch=main && git -C $LITERATE_BUILD_EMACS_PATH remote add origin $LITERATE_BUILD_EMACS_REPO && git -C $LITERATE_BUILD_EMACS_PATH fetch origin $LITERATE_BUILD_EMACS_VERSION && git -C $LITERATE_BUILD_EMACS_PATH checkout FETCH_HEAD FROM tester as foreign-document-test RUN apk add --no-cache bash coreutils @@ -100,6 +104,7 @@ RUN mkdir /foreign_documents COPY --from=foreign-document-gather /foreign_documents/howardabrams /foreign_documents/howardabrams COPY --from=foreign-document-gather /foreign_documents/doomemacs /foreign_documents/doomemacs COPY --from=foreign-document-gather /foreign_documents/worg /foreign_documents/worg +COPY --from=foreign-document-gather /foreign_documents/literate_build_emacs /foreign_documents/literate_build_emacs COPY --from=build-org-mode /root/org-mode /foreign_documents/org-mode COPY --from=build-emacs /root/emacs /foreign_documents/emacs ENTRYPOINT ["cargo", "run", "--bin", "foreign_document_test", "--features", "compare,foreign_document_test", "--profile", "release-lto"] diff --git a/src/bin_foreign_document_test.rs b/src/bin_foreign_document_test.rs index 6286571c..1101e97f 100644 --- a/src/bin_foreign_document_test.rs +++ b/src/bin_foreign_document_test.rs @@ -53,6 +53,9 @@ async fn main_body() -> Result> { let layer = layer.chain(compare_group("doomemacs", || { compare_all_org_document("/foreign_documents/doomemacs") })); + let layer = layer.chain(compare_group("literate_build_emacs", || { + compare_all_org_document("/foreign_documents/literate_build_emacs") + })); let running_tests: Vec<_> = layer.map(|c| tokio::spawn(c.run_test())).collect(); let mut any_failed = false;