Merge pull request #423 from rustcoreutils/mailx-updates

[mailx] improve testing

Author: jgarzik

mailx/compare-macos.sh

@@ -32,7 +32,7 @@ fi
 REPO_ROOT="$(cd "$MAILX_DIR/.." && pwd)"
 
 # Test data file
-TESTDATA="$MAILX_DIR/tests/cli/testdata.mbox"
+TESTDATA="$MAILX_DIR/tests/testdata.mbox"
 
 # Check prerequisites
 if [[ ! -f /usr/bin/mailx ]]; then

mailx/tests/cli/mod.rs

@@ -30,11 +30,10 @@ use tempfile::NamedTempFile;
 // Test Data Helpers
 // =============================================================================
 
-/// Get path to static test data file
+/// Get path to static test data file in tests/ directory
 fn test_data_path(filename: &str) -> PathBuf {
     let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     path.push("tests");
-    path.push("cli");
     path.push(filename);
     path
 }