Skip to content

Commit

Permalink
Merge pull request #476 from apache/test_flow_changes
Browse files Browse the repository at this point in the history
use serialization_test_data instead of target2 for cross-repo test data
  • Loading branch information
leerho authored Oct 31, 2023
2 parents fcded46 + c8ee3bb commit 007f35b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check_cpp_files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
- name: Run C++ tests
run: cd cpp && cmake --build build --config Release --target test
- name: Make dir
run: mkdir -p target/cpp_generated_files
run: mkdir -p serialization_test_data/cpp_generated_files
- name: Copy files
run: cp cpp/build/*/test/*_cpp.sk target/cpp_generated_files
run: cp cpp/build/*/test/*_cpp.sk serialization_test_data/cpp_generated_files
- name: Run Java tests
run: mvn test -P check-cpp-files
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ tmp/

# Build artifacts
target/
target2/
serialization_test_data/
out/
build/
jarsIn/
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/apache/datasketches/common/TestUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ public final class TestUtil {
/**
* The full target Path for Java serialized sketches to be tested by other languages.
*/
public static final Path javaPath = createPath("target2/java_generated_files");
public static final Path javaPath = createPath("serialization_test_data/java_generated_files");

/**
* The full target Path for C++ serialized sketches to be tested by Java.
*/
public static final Path cppPath = createPath("target2/cpp_generated_files");
public static final Path cppPath = createPath("serialization_test_data/cpp_generated_files");

private static Path createPath(final String projectLocalDir) {
try {
Expand Down

0 comments on commit 007f35b

Please sign in to comment.