docker/organic_test/Dockerfile

@@ -14,7 +14,7 @@ RUN make DESTDIR="/root/dist" install
 
 
 FROM build AS build-org-mode
-ARG ORG_VERSION=c703541ffcc14965e3567f928de1683a1c1e33f6
+ARG ORG_VERSION=163bafb43dcc2bc94a2c7ccaa77d3d1dd488f1af
 COPY --from=build-emacs /root/dist/ /
 RUN mkdir /root/dist
 # Savannah does not allow fetching specific revisions, so we're going to have to put unnecessary load on their server by cloning main and then checking out the revision we want.

scripts/run_docker_compare.bash

@@ -8,26 +8,10 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : ${TRACE:="NO"} # or YES to send traces to jaeger
 : ${BACKTRACE:="NO"} # or YES to print a rust backtrace when panicking
 : ${NO_COLOR:=""} # Set to anything to disable color output
-: ${PROFILE:="release-lto"}
 
 REALPATH=$(command -v uu-realpath || command -v realpath)
 MAKE=$(command -v gmake || command -v make)
 
-############## Setup #########################
-
-function die {
-    local status_code="$1"
-    shift
-    (>&2 echo "${@}")
-    exit "$status_code"
-}
-
-function log {
-    (>&2 echo "${@}")
-}
-
-############## Program #########################
-
 function main {
     build_container
     launch_container "${@}"
@@ -39,6 +23,7 @@ function build_container {
 
 function launch_container {
     local additional_flags=()
+    local additional_args=()
     local features=(compare)
 
     if [ "$NO_COLOR" != "" ]; then
@@ -52,8 +37,11 @@ function launch_container {
     fi
 
     if [ "$SHELL" != "YES" ]; then
+        local features_joined=$(IFS=","; echo "${features[*]}")
+        additional_args+=(cargo run --bin compare --no-default-features --features "$features_joined")
         additional_flags+=(--read-only)
     else
+        additional_args+=(/bin/sh)
         additional_flags+=(-t)
     fi
 
@@ -61,50 +49,16 @@ function launch_container {
         additional_flags+=(--env RUST_BACKTRACE=full)
     fi
 
-    if [ "$SHELL" = "YES" ]; then
-        exec docker run "${additional_flags[@]}" --init --rm -i --mount type=tmpfs,destination=/tmp -v "/:/input:ro" -v "$($REALPATH "$DIR/../"):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source --entrypoint "" organic-test /bin/sh
-    fi
-
-    local features_joined
-    features_joined=$(IFS=","; echo "${features[*]}")
-
-    local build_flags=()
-    if [ "$PROFILE" = "dev" ] || [ "$PROFILE" = "debug" ]; then
-        PROFILE="debug"
-    else
-        build_flags+=(--profile "$PROFILE")
-    fi
-
-
     if [ $# -gt 0 ]; then
         # If we passed in args, we need to forward them along
         for path in "${@}"; do
-            local full_path
-            full_path=$($REALPATH "$path")
-            init_script=$(cat <<EOF
-set -euo pipefail
-IFS=\$'\n\t'
-
-cargo build --bin compare --no-default-features --features "$features_joined" ${build_flags[@]}
-exec /target/${PROFILE}/compare "/input${full_path}"
-EOF
-                       )
-            docker run "${additional_flags[@]}" --init --rm -i --mount type=tmpfs,destination=/tmp -v "/:/input:ro"  -v "$($REALPATH "$DIR/../"):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source --entrypoint "" organic-test sh -c "$init_script"
+            local full_path=$($REALPATH "$path")
+            local containing_folder=$(dirname "$full_path")
+            local file_name=$(basename "$full_path")
+            docker run "${additional_flags[@]}" --init --rm -i --mount type=tmpfs,destination=/tmp -v "${containing_folder}:/input:ro"  -v "$($REALPATH "$DIR/../"):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source --entrypoint "" organic-test "${additional_args[@]}" -- "/input/$file_name"
         done
     else
-        local current_directory init_script
-        current_directory=$(pwd)
-        init_script=$(cat <<EOF
-set -euo pipefail
-IFS=\$'\n\t'
-
-cargo build --bin compare --no-default-features --features "$features_joined" ${build_flags[@]}
-cd /input${current_directory}
-exec /target/${PROFILE}/compare
-EOF
-                       )
-
-        docker run "${additional_flags[@]}" --init --rm -i --mount type=tmpfs,destination=/tmp -v "/:/input:ro" -v "$($REALPATH "$DIR/../"):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source --entrypoint "" organic-test sh -c "$init_script"
+        docker run "${additional_flags[@]}" --init --rm -i --mount type=tmpfs,destination=/tmp -v "$($REALPATH "$DIR/../"):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source --entrypoint "" organic-test "${additional_args[@]}"
     fi
 }
 

scripts/run_docker_compare_bisect.bash

@@ -9,6 +9,17 @@ REALPATH=$(command -v uu-realpath || command -v realpath)
 
 ############## Setup #########################
 
+function cleanup {
+    for f in "${folders[@]}"; do
+        log "Deleting $f"
+        rm -rf "$f"
+    done
+}
+folders=()
+for sig in EXIT INT QUIT HUP TERM; do
+  trap "set +e; cleanup" "$sig"
+done
+
 function die {
     local status_code="$1"
     shift
@@ -23,18 +34,18 @@ function log {
 ############## Program #########################
 
 function main {
-    local target_full_path
-    target_full_path=$($REALPATH "$1")
+    log "Is is recommended that the output of \`mktemp -d -t 'compare_bisect.XXXXXXXX'\` is inside a tmpfs filesystem since this script will make many writes to these folders."
+
+    local target_full_path=$($REALPATH "$1")
     SOURCE_FOLDER=$(dirname "$target_full_path")
     TARGET_DOCUMENT=$(basename "$target_full_path")
 
 
     local good=0
-    local bad
-    bad=$(wc -l "$SOURCE_FOLDER/$TARGET_DOCUMENT" | awk '{print $1}')
+    local bad=$(wc -l "$SOURCE_FOLDER/$TARGET_DOCUMENT" | awk '{print $1}')
 
     set +e
-    (run_parse "$bad")
+    run_parse "$bad" &> /dev/null
     local status=$?
     set -e
     if [ $status -eq 0 ]; then
@@ -60,12 +71,21 @@ function main {
     echo "Bad line: $bad"
 }
 
+function setup_temp_dir {
+    local temp_dir=$(mktemp -d -t 'compare_bisect.XXXXXXXX')
+    cp -r "$SOURCE_FOLDER/"* "$temp_dir/"
+    echo "$temp_dir"
+}
+
 function run_parse {
     local lines="$1"
-
-    cd "$SOURCE_FOLDER"
-    head -n "$lines" "$SOURCE_FOLDER/$TARGET_DOCUMENT" | "${DIR}/run_docker_compare.bash"
+    local temp_dir=$(setup_temp_dir)
+    folders+=("$temp_dir")
+    cat "$SOURCE_FOLDER/$TARGET_DOCUMENT" | head -n "$lines" > "$temp_dir/$TARGET_DOCUMENT"
+    "${DIR}/run_docker_compare.bash" "$temp_dir/$TARGET_DOCUMENT"
     local status=$?
+    rm -rf "$temp_dir"
+    # TODO: Remove temp_dir from folders
     return "$status"
 }
 

src/parser/text_markup.rs

@@ -20,7 +20,6 @@ use super::org_source::OrgSource;
 use super::radio_link::RematchObject;
 use super::util::in_object_section;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
-use super::util::start_of_line;
 use crate::context::parser_with_context;
 use crate::context::ContextElement;
 use crate::context::ContextMatcher;
@@ -65,7 +64,8 @@ fn bold<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Bold<'s>> {
-    let (remaining, children) = text_markup_object("*")(context, input)?;
+    let text_markup_object_specialized = text_markup_object("*");
+    let (remaining, children) = text_markup_object_specialized(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
@@ -81,7 +81,8 @@ fn italic<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Italic<'s>> {
-    let (remaining, children) = text_markup_object("/")(context, input)?;
+    let text_markup_object_specialized = text_markup_object("/");
+    let (remaining, children) = text_markup_object_specialized(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
@@ -97,7 +98,8 @@ fn underline<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Underline<'s>> {
-    let (remaining, children) = text_markup_object("_")(context, input)?;
+    let text_markup_object_specialized = text_markup_object("_");
+    let (remaining, children) = text_markup_object_specialized(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
@@ -113,7 +115,8 @@ fn strike_through<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, StrikeThrough<'s>> {
-    let (remaining, children) = text_markup_object("+")(context, input)?;
+    let text_markup_object_specialized = text_markup_object("+");
+    let (remaining, children) = text_markup_object_specialized(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
@@ -129,7 +132,8 @@ fn verbatim<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Verbatim<'s>> {
-    let (remaining, contents) = text_markup_string("=")(context, input)?;
+    let text_markup_string_specialized = text_markup_string("=");
+    let (remaining, contents) = text_markup_string_specialized(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
@@ -145,7 +149,8 @@ fn code<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Code<'s>> {
-    let (remaining, contents) = text_markup_string("~")(context, input)?;
+    let text_markup_string_specialized = text_markup_string("~");
+    let (remaining, contents) = text_markup_string_specialized(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
@@ -287,22 +292,16 @@ fn pre<'b, 'g, 'r, 's>(
     _context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, ()> {
-    if start_of_line(input).is_ok() {
-        return Ok((input, ()));
-    }
-    if preceded_by_whitespace(true)(input).is_ok() {
-        return Ok((input, ()));
-    }
     let preceding_character = input.get_preceding_character();
     match preceding_character {
         // If None, we are at the start of the file which is technically the beginning of a line.
-        Some('-') | Some('(') | Some('{') | Some('\'') | Some('"') => {}
+        None | Some('\r') | Some('\n') | Some(' ') | Some('\t') | Some('-') | Some('(')
+        | Some('{') | Some('\'') | Some('"') | Some('<') => {}
         Some(_) => {
             return Err(nom::Err::Error(CustomError::MyError(MyError(
                 "Not a valid pre character for text markup.".into(),
             ))));
         }
-        None => unreachable!(), // None is for start of file, which should already be handled by the start_of_line matcher above.
     };
     Ok((input, ()))
 }