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
../test-suite/djinni-output-temp/cpp/date_record.hpp djinni-output-temp/cpp/date_record.hpp
../test-suite/djinni-output-temp/cpp/map_date_record.hpp djinni-output-temp/cpp/map_date_record.hpp
../test-suite/djinni-output-temp/cpp/constants.hpp djinni-output-temp/cpp/constants.hpp
../test-suite/djinni-output-temp/cpp/constants.cpp djinni-output-temp/cpp/constants.cpp
../test-suite/djinni-output-temp/cpp/constants_interface.hpp djinni-output-temp/cpp/constants_interface.hpp
../test-suite/djinni-output-temp/cpp/constants_interface.cpp djinni-output-temp/cpp/constants_interface.cpp
../test-suite/djinni-output-temp/cpp/assorted_primitives.hpp djinni-output-temp/cpp/assorted_primitives.hpp
../test-suite/djinni-output-temp/cpp/assorted_primitives.cpp djinni-output-temp/cpp/assorted_primitives.cpp
../test-suite/djinni-output-temp/cpp/test_helpers.hpp djinni-output-temp/cpp/test_helpers.hpp
../test-suite/djinni-output-temp/cpp/token.hpp djinni-output-temp/cpp/token.hpp
../test-suite/djinni-output-temp/cpp/color.hpp djinni-output-temp/cpp/color.hpp
../test-suite/djinni-output-temp/cpp/client_returned_record.hpp djinni-output-temp/cpp/client_returned_record.hpp
../test-suite/djinni-output-temp/cpp/client_interface.hpp djinni-output-temp/cpp/client_interface.hpp
../test-suite/djinni-output-temp/cpp/cpp_exception.hpp djinni-output-temp/cpp/cpp_exception.hpp
../test-suite/djinni-output-temp/cpp/primitive_list.hpp djinni-output-temp/cpp/primitive_list.hpp
../test-suite/djinni-output-temp/cpp/map_record.hpp djinni-output-temp/cpp/map_record.hpp
../test-suite/djinni-output-temp/cpp/map_list_record.hpp djinni-output-temp/cpp/map_list_record.hpp
../test-suite/djinni-output-temp/cpp/nested_collection.hpp djinni-output-temp/cpp/nested_collection.hpp
../test-suite/djinni-output-temp/cpp/record_with_derivings.hpp djinni-output-temp/cpp/record_with_derivings.hpp
../test-suite/djinni-output-temp/cpp/record_with_derivings.cpp djinni-output-temp/cpp/record_with_derivings.cpp
../test-suite/djinni-output-temp/cpp/record_with_nested_derivings.hpp djinni-output-temp/cpp/record_with_nested_derivings.hpp
../test-suite/djinni-output-temp/cpp/record_with_nested_derivings.cpp djinni-output-temp/cpp/record_with_nested_derivings.cpp
../test-suite/djinni-output-temp/cpp/set_record.hpp djinni-output-temp/cpp/set_record.hpp
../test-suite/djinni-output-temp/java/DateRecord.java djinni-output-temp/java/DateRecord.java
../test-suite/djinni-output-temp/java/MapDateRecord.java djinni-output-temp/java/MapDateRecord.java
../test-suite/djinni-output-temp/java/Constants.java djinni-output-temp/java/Constants.java
../test-suite/djinni-output-temp/java/ConstantsInterface.java djinni-output-temp/java/ConstantsInterface.java
../test-suite/djinni-output-temp/java/AssortedPrimitives.java djinni-output-temp/java/AssortedPrimitives.java
../test-suite/djinni-output-temp/java/TestHelpers.java djinni-output-temp/java/TestHelpers.java
../test-suite/djinni-output-temp/java/Token.java djinni-output-temp/java/Token.java
../test-suite/djinni-output-temp/java/Color.java djinni-output-temp/java/Color.java
../test-suite/djinni-output-temp/java/ClientReturnedRecord.java djinni-output-temp/java/ClientReturnedRecord.java
../test-suite/djinni-output-temp/java/ClientInterface.java djinni-output-temp/java/ClientInterface.java
../test-suite/djinni-output-temp/java/CppException.java djinni-output-temp/java/CppException.java
../test-suite/djinni-output-temp/java/PrimitiveList.java djinni-output-temp/java/PrimitiveList.java
../test-suite/djinni-output-temp/java/MapRecord.java djinni-output-temp/java/MapRecord.java
../test-suite/djinni-output-temp/java/MapListRecord.java djinni-output-temp/java/MapListRecord.java
../test-suite/djinni-output-temp/java/NestedCollection.java djinni-output-temp/java/NestedCollection.java
../test-suite/djinni-output-temp/java/RecordWithDerivings.java djinni-output-temp/java/RecordWithDerivings.java
../test-suite/djinni-output-temp/java/RecordWithNestedDerivings.java djinni-output-temp/java/RecordWithNestedDerivings.java
../test-suite/djinni-output-temp/java/SetRecord.java djinni-output-temp/java/SetRecord.java
../test-suite/djinni-output-temp/jni/NativeDateRecord.hpp djinni-output-temp/jni/NativeDateRecord.hpp
../test-suite/djinni-output-temp/jni/NativeDateRecord.cpp djinni-output-temp/jni/NativeDateRecord.cpp
../test-suite/djinni-output-temp/jni/NativeMapDateRecord.hpp djinni-output-temp/jni/NativeMapDateRecord.hpp
../test-suite/djinni-output-temp/jni/NativeMapDateRecord.cpp djinni-output-temp/jni/NativeMapDateRecord.cpp
../test-suite/djinni-output-temp/jni/NativeConstants.hpp djinni-output-temp/jni/NativeConstants.hpp
../test-suite/djinni-output-temp/jni/NativeConstants.cpp djinni-output-temp/jni/NativeConstants.cpp
../test-suite/djinni-output-temp/jni/NativeConstantsInterface.hpp djinni-output-temp/jni/NativeConstantsInterface.hpp
../test-suite/djinni-output-temp/jni/NativeConstantsInterface.cpp djinni-output-temp/jni/NativeConstantsInterface.cpp
../test-suite/djinni-output-temp/jni/NativeAssortedPrimitives.hpp djinni-output-temp/jni/NativeAssortedPrimitives.hpp
../test-suite/djinni-output-temp/jni/NativeAssortedPrimitives.cpp djinni-output-temp/jni/NativeAssortedPrimitives.cpp
../test-suite/djinni-output-temp/jni/NativeTestHelpers.hpp djinni-output-temp/jni/NativeTestHelpers.hpp
../test-suite/djinni-output-temp/jni/NativeTestHelpers.cpp djinni-output-temp/jni/NativeTestHelpers.cpp
../test-suite/djinni-output-temp/jni/NativeToken.hpp djinni-output-temp/jni/NativeToken.hpp
../test-suite/djinni-output-temp/jni/NativeToken.cpp djinni-output-temp/jni/NativeToken.cpp
../test-suite/djinni-output-temp/jni/NativeColor.hpp djinni-output-temp/jni/NativeColor.hpp
../test-suite/djinni-output-temp/jni/NativeClientReturnedRecord.hpp djinni-output-temp/jni/NativeClientReturnedRecord.hpp
../test-suite/djinni-output-temp/jni/NativeClientReturnedRecord.cpp djinni-output-temp/jni/NativeClientReturnedRecord.cpp
../test-suite/djinni-output-temp/jni/NativeClientInterface.hpp djinni-output-temp/jni/NativeClientInterface.hpp
../test-suite/djinni-output-temp/jni/NativeClientInterface.cpp djinni-output-temp/jni/NativeClientInterface.cpp
../test-suite/djinni-output-temp/jni/NativeCppException.hpp djinni-output-temp/jni/NativeCppException.hpp
../test-suite/djinni-output-temp/jni/NativeCppException.cpp djinni-output-temp/jni/NativeCppException.cpp
../test-suite/djinni-output-temp/jni/NativePrimitiveList.hpp djinni-output-temp/jni/NativePrimitiveList.hpp
../test-suite/djinni-output-temp/jni/NativePrimitiveList.cpp djinni-output-temp/jni/NativePrimitiveList.cpp
../test-suite/djinni-output-temp/jni/NativeMapRecord.hpp djinni-output-temp/jni/NativeMapRecord.hpp
../test-suite/djinni-output-temp/jni/NativeMapRecord.cpp djinni-output-temp/jni/NativeMapRecord.cpp
../test-suite/djinni-output-temp/jni/NativeMapListRecord.hpp djinni-output-temp/jni/NativeMapListRecord.hpp
../test-suite/djinni-output-temp/jni/NativeMapListRecord.cpp djinni-output-temp/jni/NativeMapListRecord.cpp
../test-suite/djinni-output-temp/jni/NativeNestedCollection.hpp djinni-output-temp/jni/NativeNestedCollection.hpp
../test-suite/djinni-output-temp/jni/NativeNestedCollection.cpp djinni-output-temp/jni/NativeNestedCollection.cpp
../test-suite/djinni-output-temp/jni/NativeRecordWithDerivings.hpp djinni-output-temp/jni/NativeRecordWithDerivings.hpp
../test-suite/djinni-output-temp/jni/NativeRecordWithDerivings.cpp djinni-output-temp/jni/NativeRecordWithDerivings.cpp
../test-suite/djinni-output-temp/jni/NativeRecordWithNestedDerivings.hpp djinni-output-temp/jni/NativeRecordWithNestedDerivings.hpp
../test-suite/djinni-output-temp/jni/NativeRecordWithNestedDerivings.cpp djinni-output-temp/jni/NativeRecordWithNestedDerivings.cpp
../test-suite/djinni-output-temp/jni/NativeSetRecord.hpp djinni-output-temp/jni/NativeSetRecord.hpp
../test-suite/djinni-output-temp/jni/NativeSetRecord.cpp djinni-output-temp/jni/NativeSetRecord.cpp
../test-suite/djinni-output-temp/objc/DBDateRecord.h djinni-output-temp/objc/DBDateRecord.h
../test-suite/djinni-output-temp/objc/DBDateRecord.mm djinni-output-temp/objc/DBDateRecord.mm
../test-suite/djinni-output-temp/objc/DBMapDateRecord.h djinni-output-temp/objc/DBMapDateRecord.h
../test-suite/djinni-output-temp/objc/DBMapDateRecord.mm djinni-output-temp/objc/DBMapDateRecord.mm
../test-suite/djinni-output-temp/objc/DBConstants.h djinni-output-temp/objc/DBConstants.h
../test-suite/djinni-output-temp/objc/DBConstants.mm djinni-output-temp/objc/DBConstants.mm
../test-suite/djinni-output-temp/objc/DBConstantsInterface.h djinni-output-temp/objc/DBConstantsInterface.h
../test-suite/djinni-output-temp/objc/DBConstantsInterface.mm djinni-output-temp/objc/DBConstantsInterface.mm
../test-suite/djinni-output-temp/objc/DBAssortedPrimitives.h djinni-output-temp/objc/DBAssortedPrimitives.h
../test-suite/djinni-output-temp/objc/DBAssortedPrimitives.mm djinni-output-temp/objc/DBAssortedPrimitives.mm
../test-suite/djinni-output-temp/objc/DBTestHelpers.h djinni-output-temp/objc/DBTestHelpers.h
../test-suite/djinni-output-temp/objc/DBToken.h djinni-output-temp/objc/DBToken.h
../test-suite/djinni-output-temp/objc/DBColor.h djinni-output-temp/objc/DBColor.h
../test-suite/djinni-output-temp/objc/DBClientReturnedRecord.h djinni-output-temp/objc/DBClientReturnedRecord.h
../test-suite/djinni-output-temp/objc/DBClientReturnedRecord.mm djinni-output-temp/objc/DBClientReturnedRecord.mm
../test-suite/djinni-output-temp/objc/DBClientInterface.h djinni-output-temp/objc/DBClientInterface.h
../test-suite/djinni-output-temp/objc/DBCppException.h djinni-output-temp/objc/DBCppException.h
../test-suite/djinni-output-temp/objc/DBPrimitiveList.h djinni-output-temp/objc/DBPrimitiveList.h
../test-suite/djinni-output-temp/objc/DBPrimitiveList.mm djinni-output-temp/objc/DBPrimitiveList.mm
../test-suite/djinni-output-temp/objc/DBMapRecord.h djinni-output-temp/objc/DBMapRecord.h
../test-suite/djinni-output-temp/objc/DBMapRecord.mm djinni-output-temp/objc/DBMapRecord.mm
../test-suite/djinni-output-temp/objc/DBMapListRecord.h djinni-output-temp/objc/DBMapListRecord.h
../test-suite/djinni-output-temp/objc/DBMapListRecord.mm djinni-output-temp/objc/DBMapListRecord.mm
../test-suite/djinni-output-temp/objc/DBNestedCollection.h djinni-output-temp/objc/DBNestedCollection.h
../test-suite/djinni-output-temp/objc/DBNestedCollection.mm djinni-output-temp/objc/DBNestedCollection.mm
../test-suite/djinni-output-temp/objc/DBRecordWithDerivings.h djinni-output-temp/objc/DBRecordWithDerivings.h
../test-suite/djinni-output-temp/objc/DBRecordWithDerivings.mm djinni-output-temp/objc/DBRecordWithDerivings.mm
../test-suite/djinni-output-temp/objc/DBRecordWithNestedDerivings.h djinni-output-temp/objc/DBRecordWithNestedDerivings.h
../test-suite/djinni-output-temp/objc/DBRecordWithNestedDerivings.mm djinni-output-temp/objc/DBRecordWithNestedDerivings.mm
../test-suite/djinni-output-temp/objc/DBSetRecord.h djinni-output-temp/objc/DBSetRecord.h
../test-suite/djinni-output-temp/objc/DBSetRecord.mm djinni-output-temp/objc/DBSetRecord.mm
../test-suite/djinni-output-temp/objc/DBDateRecord+Private.h djinni-output-temp/objc/DBDateRecord+Private.h
../test-suite/djinni-output-temp/objc/DBDateRecord+Private.mm djinni-output-temp/objc/DBDateRecord+Private.mm
../test-suite/djinni-output-temp/objc/DBMapDateRecord+Private.h djinni-output-temp/objc/DBMapDateRecord+Private.h
../test-suite/djinni-output-temp/objc/DBMapDateRecord+Private.mm djinni-output-temp/objc/DBMapDateRecord+Private.mm
../test-suite/djinni-output-temp/objc/DBConstants+Private.h djinni-output-temp/objc/DBConstants+Private.h
../test-suite/djinni-output-temp/objc/DBConstants+Private.mm djinni-output-temp/objc/DBConstants+Private.mm
../test-suite/djinni-output-temp/objc/DBConstantsInterface+Private.h djinni-output-temp/objc/DBConstantsInterface+Private.h
../test-suite/djinni-output-temp/objc/DBConstantsInterface+Private.mm djinni-output-temp/objc/DBConstantsInterface+Private.mm
../test-suite/djinni-output-temp/objc/DBAssortedPrimitives+Private.h djinni-output-temp/objc/DBAssortedPrimitives+Private.h
../test-suite/djinni-output-temp/objc/DBAssortedPrimitives+Private.mm djinni-output-temp/objc/DBAssortedPrimitives+Private.mm
../test-suite/djinni-output-temp/objc/DBTestHelpers+Private.h djinni-output-temp/objc/DBTestHelpers+Private.h
../test-suite/djinni-output-temp/objc/DBTestHelpers+Private.mm djinni-output-temp/objc/DBTestHelpers+Private.mm
../test-suite/djinni-output-temp/objc/DBToken+Private.h djinni-output-temp/objc/DBToken+Private.h
../test-suite/djinni-output-temp/objc/DBToken+Private.mm djinni-output-temp/objc/DBToken+Private.mm
../test-suite/djinni-output-temp/objc/DBClientReturnedRecord+Private.h djinni-output-temp/objc/DBClientReturnedRecord+Private.h
../test-suite/djinni-output-temp/objc/DBClientReturnedRecord+Private.mm djinni-output-temp/objc/DBClientReturnedRecord+Private.mm
../test-suite/djinni-output-temp/objc/DBClientInterface+Private.h djinni-output-temp/objc/DBClientInterface+Private.h
../test-suite/djinni-output-temp/objc/DBClientInterface+Private.mm djinni-output-temp/objc/DBClientInterface+Private.mm
../test-suite/djinni-output-temp/objc/DBCppException+Private.h djinni-output-temp/objc/DBCppException+Private.h
../test-suite/djinni-output-temp/objc/DBCppException+Private.mm djinni-output-temp/objc/DBCppException+Private.mm
../test-suite/djinni-output-temp/objc/DBPrimitiveList+Private.h djinni-output-temp/objc/DBPrimitiveList+Private.h
../test-suite/djinni-output-temp/objc/DBPrimitiveList+Private.mm djinni-output-temp/objc/DBPrimitiveList+Private.mm
../test-suite/djinni-output-temp/objc/DBMapRecord+Private.h djinni-output-temp/objc/DBMapRecord+Private.h
../test-suite/djinni-output-temp/objc/DBMapRecord+Private.mm djinni-output-temp/objc/DBMapRecord+Private.mm
../test-suite/djinni-output-temp/objc/DBMapListRecord+Private.h djinni-output-temp/objc/DBMapListRecord+Private.h
../test-suite/djinni-output-temp/objc/DBMapListRecord+Private.mm djinni-output-temp/objc/DBMapListRecord+Private.mm
../test-suite/djinni-output-temp/objc/DBNestedCollection+Private.h djinni-output-temp/objc/DBNestedCollection+Private.h
../test-suite/djinni-output-temp/objc/DBNestedCollection+Private.mm djinni-output-temp/objc/DBNestedCollection+Private.mm
../test-suite/djinni-output-temp/objc/DBRecordWithDerivings+Private.h djinni-output-temp/objc/DBRecordWithDerivings+Private.h
../test-suite/djinni-output-temp/objc/DBRecordWithDerivings+Private.mm djinni-output-temp/objc/DBRecordWithDerivings+Private.mm
../test-suite/djinni-output-temp/objc/DBRecordWithNestedDerivings+Private.h djinni-output-temp/objc/DBRecordWithNestedDerivings+Private.h
../test-suite/djinni-output-temp/objc/DBRecordWithNestedDerivings+Private.mm djinni-output-temp/objc/DBRecordWithNestedDerivings+Private.mm
../test-suite/djinni-output-temp/objc/DBSetRecord+Private.h djinni-output-temp/objc/DBSetRecord+Private.h
../test-suite/djinni-output-temp/objc/DBSetRecord+Private.mm djinni-output-temp/objc/DBSetRecord+Private.mm
...@@ -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