Commit 6205c73f authored by Andrew Twyman's avatar Andrew Twyman Committed by Jacob Potter

Ensure relative paths in in/out file lists of test suite.

Comment in shell script explains why.
parent 1d50fdf4
../test-suite/djinni/all.djinni djinni/all.djinni
../test-suite/djinni/set.djinni djinni/set.djinni
../test-suite/djinni/derivings.djinni djinni/derivings.djinni
../test-suite/djinni/nested_collection.djinni djinni/nested_collection.djinni
../test-suite/djinni/map.djinni djinni/map.djinni
../test-suite/djinni/primitive_list.djinni djinni/primitive_list.djinni
../test-suite/djinni/exception.djinni djinni/exception.djinni
../test-suite/djinni/client_interface.djinni djinni/client_interface.djinni
../test-suite/djinni/enum.djinni djinni/enum.djinni
../test-suite/djinni/token.djinni djinni/token.djinni
../test-suite/djinni/test.djinni djinni/test.djinni
../test-suite/djinni/primtypes.djinni djinni/primtypes.djinni
../test-suite/djinni/constants.djinni djinni/constants.djinni
../test-suite/djinni/date.djinni djinni/date.djinni
This diff is collapsed.
...@@ -18,6 +18,13 @@ base_dir=$(cd "`dirname "$loc"`" && pwd) ...@@ -18,6 +18,13 @@ base_dir=$(cd "`dirname "$loc"`" && pwd)
temp_out="$base_dir/djinni-output-temp" temp_out="$base_dir/djinni-output-temp"
in="$base_dir/djinni/all.djinni" in="$base_dir/djinni/all.djinni"
# Relative version of in and temp_out are used for Djinni call below so that
# generated lists of infiles/outfiles are not machine-dependent. This
# is an artifact of the test suite, where we want the genereated files
# to be in git for examination.
in_relative="djinni/all.djinni"
temp_out_relative="djinni-output-temp"
cpp_out="$base_dir/generated-src/cpp" cpp_out="$base_dir/generated-src/cpp"
jni_out="$base_dir/generated-src/jni" jni_out="$base_dir/generated-src/jni"
objc_out="$base_dir/generated-src/objc" objc_out="$base_dir/generated-src/objc"
...@@ -42,6 +49,8 @@ elif [ $# -eq 1 ]; then ...@@ -42,6 +49,8 @@ elif [ $# -eq 1 ]; then
rm -r "$dir" rm -r "$dir"
fi fi
done done
rm "$base_dir/generated-src/inFileList.txt"
rm "$base_dir/generated-src/outFileList.txt"
exit exit
fi fi
...@@ -50,26 +59,26 @@ fi ...@@ -50,26 +59,26 @@ fi
[ ! -e "$temp_out" ] || rm -r "$temp_out" [ ! -e "$temp_out" ] || rm -r "$temp_out"
(cd "$base_dir" && \ (cd "$base_dir" && \
"$base_dir/../src/run-assume-built" \ "$base_dir/../src/run-assume-built" \
--java-out "$temp_out/java" \ --java-out "$temp_out_relative/java" \
--java-package $java_package \ --java-package $java_package \
--java-nullable-annotation "javax.annotation.CheckForNull" \ --java-nullable-annotation "javax.annotation.CheckForNull" \
--java-nonnull-annotation "javax.annotation.Nonnull" \ --java-nonnull-annotation "javax.annotation.Nonnull" \
--ident-java-field mFooBar \ --ident-java-field mFooBar \
\ \
--cpp-out "$temp_out/cpp" \ --cpp-out "$temp_out_relative/cpp" \
--ident-cpp-enum-type foo_bar \ --ident-cpp-enum-type foo_bar \
--cpp-optional-template "std::experimental::optional" \ --cpp-optional-template "std::experimental::optional" \
--cpp-optional-header "<experimental/optional>" \ --cpp-optional-header "<experimental/optional>" \
\ \
--jni-out "$temp_out/jni" \ --jni-out "$temp_out_relative/jni" \
--ident-jni-class NativeFooBar \ --ident-jni-class NativeFooBar \
--ident-jni-file NativeFooBar \ --ident-jni-file NativeFooBar \
\ \
--objc-out "$temp_out/objc" \ --objc-out "$temp_out_relative/objc" \
--objcpp-out "$temp_out/objc" \ --objcpp-out "$temp_out_relative/objc" \
--objc-type-prefix DB \ --objc-type-prefix DB \
\ \
--idl "$in" \ --idl "$in_relative" \
--list-in-files "./generated-src/inFileList.txt" \ --list-in-files "./generated-src/inFileList.txt" \
--list-out-files "./generated-src/outFileList.txt"\ --list-out-files "./generated-src/outFileList.txt"\
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment