merge

1 files changed, 6 insertions, 4 deletions

diff --git a/tests/misc.extract-parallel-weighted/run.perl b/tests/misc.extract-parallel-weighted/run.perl
index b9b0485..c6a1ed0 100755
--- a/tests/misc.extract-parallel-weighted/run.perl
+++ b/tests/misc.extract-parallel-weighted/run.perl
@@ -16,18 +16,17 @@ GetOptions("moses-root=s" => \$mosesRoot,
            "test-dir=s"=> \$test_dir,
            "results-dir=s"=> \$results_dir,
           ) or exit 1;
-my $is_osx = ($^O eq "darwin");
-my $catCmd = $is_osx?"gunzip -c ":"zcat ";
-my $splitCmd = $is_osx?"gsplit ":"split ";
-my $sortCmd = $is_osx?"gsort ":"sort ";
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 my $cmd;
 $cmd = "$mosesRoot/scripts/generic/extract-parallel.perl 2 $splitCmd $sortCmd $mosesBin/extract $test_dir/$test_name/en $test_dir/$test_name/fr $test_dir/$test_name/align.fr-en $results_dir/extract 7 --GZOutput --InstanceWeights $test_dir/$test_name/weights 2> $results_dir/log";
 print STDERR "Executing: $cmd\n";
 `$cmd`;
 system("$catCmd $results_dir/extract.sorted.gz $results_dir/extract.inv.sorted.gz > $results_dir/out");
 =======
+=======
+>>>>>>> 47addea26d2effd79843275644e2d287aa282266
 my $SPLIT_EXEC = `gsplit --help 2>/dev/null`; 
 if($SPLIT_EXEC) {
   $SPLIT_EXEC = 'gsplit';
@@ -52,6 +51,9 @@ print STDERR "Executing: $cmd\n";
 `$cmd`;
 
 system("$CAT_EXEC $results_dir/extract.sorted.gz $results_dir/extract.inv.sorted.gz > $results_dir/out");
+<<<<<<< HEAD
 >>>>>>> 475688bf6e70934b733b1e3ffb711f997c993ba3
+=======
+>>>>>>> 47addea26d2effd79843275644e2d287aa282266