From 90fb2dc95e7b86a1154fad9228f84fd96f58dc96 Mon Sep 17 00:00:00 2001 From: Eric Eide Date: Wed, 25 May 2011 14:50:20 -0600 Subject: [PATCH] Use `*_HOME' instead of `*_PATH' variable names consistently. Use `HOME' to identify a single directory; use `PATH' to identify a list of directories. --- utah/scripts/coverage/README.COV | 18 ++--- utah/scripts/coverage/build_gcov_compilers.pl | 48 ++++++------- utah/scripts/coverage/gen_cov.pl | 70 +++++++++---------- utah/scripts/coverage/parse_cov_results.pl | 20 +++--- utah/scripts/john_driver/evaluate_program.pl | 8 +-- utah/scripts/john_driver/random_test.pl | 10 +-- utah/scripts/john_driver/run_program.pl | 8 +-- utah/scripts/one_off/reducer_driver.pl | 6 +- utah/scripts/one_off/test_framac.pl | 4 +- utah/scripts/reduce/simple_delta.pl | 6 +- 10 files changed, 99 insertions(+), 99 deletions(-) diff --git a/utah/scripts/coverage/README.COV b/utah/scripts/coverage/README.COV index 063cd7be0..8647839bd 100644 --- a/utah/scripts/coverage/README.COV +++ b/utah/scripts/coverage/README.COV @@ -3,11 +3,11 @@ ************************************************************ - Quick start to build optimized compilers: - * setup $COV_BASE_PATH environment, e.g in bash: - export COV_BASE_PATH=/uusoc/exports/scratch/chenyang/branch-test, + * setup $COV_BASE_HOME environment, e.g in bash: + export COV_BASE_HOME=/uusoc/exports/scratch/chenyang/branch-test, where holds all coverage stuff - * cd $COV_BASE_PATH + * cd $COV_BASE_HOME mkdir sources and check out csmith: @@ -18,17 +18,17 @@ * ./build_gcov_compilers.pl -enable-opt - * optimized gcc and clang were installed in $COV_BASE_PATH/bin + * optimized gcc and clang were installed in $COV_BASE_HOME/bin ************************************************************ - Coverage test steps: - * setup $COV_BASE_PATH environment, e.g in bash: - export COV_BASE_PATH=/uusoc/exports/scratch/chenyang/branch-test, + * setup $COV_BASE_HOME environment, e.g in bash: + export COV_BASE_HOME=/uusoc/exports/scratch/chenyang/branch-test, where holds all coverage stuff - * cd $COV_BASE_PATH + * cd $COV_BASE_HOME mkdir sources and check out csmith: @@ -41,11 +41,11 @@ * run build_gcov_compilers.pl script, which will: - - download compilers sources to $COV_BASE_PATH/sources; + - download compilers sources to $COV_BASE_HOME/sources; - build compilers with appropriate options - - install compilers to $COV_BASE_PATH + - install compilers to $COV_BASE_HOME * run gen_cov.pl, which will run coverage tests for llvm and gcc. For each tested compilers, the script will: diff --git a/utah/scripts/coverage/build_gcov_compilers.pl b/utah/scripts/coverage/build_gcov_compilers.pl index e1c9de7d8..cd3473c9a 100755 --- a/utah/scripts/coverage/build_gcov_compilers.pl +++ b/utah/scripts/coverage/build_gcov_compilers.pl @@ -10,19 +10,19 @@ my $CPUS = Sys::CPU::cpu_count(); -my $COV_BASE_PATH = $ENV{"COV_BASE_PATH"}; +my $COV_BASE_HOME = $ENV{"COV_BASE_HOME"}; ######################################################## -#die "please set env $COV_BASE_PATH first!" -# if (!defined($COV_BASE_PATH)); +#die "please set env $COV_BASE_HOME first!" +# if (!defined($COV_BASE_HOME)); # for my convenience -if (!defined($COV_BASE_PATH)) { - $COV_BASE_PATH = "/uusoc/exports/scratch/chenyang/tmp/branch_test"; +if (!defined($COV_BASE_HOME)) { + $COV_BASE_HOME = "/uusoc/exports/scratch/chenyang/tmp/branch_test"; } -my $COMPILER_SOURCES_PATH = "$COV_BASE_PATH/sources"; +my $COMPILER_SOURCES_HOME = "$COV_BASE_HOME/sources"; my @compilers = ( "gcc", @@ -32,12 +32,12 @@ ); my %paths = ( - "gcc" => ["$COMPILER_SOURCES_PATH", "current-gcc"], - "llvm" => ["$COMPILER_SOURCES_PATH", "llvm"], - "llvm-regular" => ["$COMPILER_SOURCES_PATH", "llvm-regular"], - "llvm-gcc" => ["$COMPILER_SOURCES_PATH", "llvm-gcc-4.2"], - "clang" => ["$COMPILER_SOURCES_PATH/llvm/tools", "clang"], - "llvm-testsuite" => ["$COMPILER_SOURCES_PATH/llvm/projects", "test-suite"], + "gcc" => ["$COMPILER_SOURCES_HOME", "current-gcc"], + "llvm" => ["$COMPILER_SOURCES_HOME", "llvm"], + "llvm-regular" => ["$COMPILER_SOURCES_HOME", "llvm-regular"], + "llvm-gcc" => ["$COMPILER_SOURCES_HOME", "llvm-gcc-4.2"], + "clang" => ["$COMPILER_SOURCES_HOME/llvm/tools", "clang"], + "llvm-testsuite" => ["$COMPILER_SOURCES_HOME/llvm/projects", "test-suite"], ); my %svn_dependencies = ( @@ -67,12 +67,12 @@ my $enable_optimized = ""; my %config_options = ( - "gcc" => "--prefix=$COV_BASE_PATH --program-prefix=current- --enable-languages=c,c++ --enable-lto --enable-coverage --disable-bootstrap", - "gcc-opt" => "--prefix=$COV_BASE_PATH --program-prefix=current- --enable-languages=c,c++ --enable-lto --enable-coverage=opt --disable-bootstrap", - "llvm" => "--prefix=$COV_BASE_PATH", - "llvm-opt" => "--prefix=$COV_BASE_PATH --enable-optimized", - "llvm-regular" => "--prefix=$COV_BASE_PATH --enable-optimized", - "llvm-gcc" => "--prefix=$COV_BASE_PATH --enable-languages=c,c++ --program-prefix=llvm- --enable-checking --enable-llvm=$COMPILER_SOURCES_PATH/llvm-regular/build --disable-bootstrap --disable-multilib", + "gcc" => "--prefix=$COV_BASE_HOME --program-prefix=current- --enable-languages=c,c++ --enable-lto --enable-coverage --disable-bootstrap", + "gcc-opt" => "--prefix=$COV_BASE_HOME --program-prefix=current- --enable-languages=c,c++ --enable-lto --enable-coverage=opt --disable-bootstrap", + "llvm" => "--prefix=$COV_BASE_HOME", + "llvm-opt" => "--prefix=$COV_BASE_HOME --enable-optimized", + "llvm-regular" => "--prefix=$COV_BASE_HOME --enable-optimized", + "llvm-gcc" => "--prefix=$COV_BASE_HOME --enable-languages=c,c++ --program-prefix=llvm- --enable-checking --enable-llvm=$COMPILER_SOURCES_HOME/llvm-regular/build --disable-bootstrap --disable-multilib", ); my %make_options = ( @@ -245,7 +245,7 @@ () download($program, $path, $dir, $svn_repo); - my $working_dir = "$COMPILER_SOURCES_PATH/llvm/build"; + my $working_dir = "$COMPILER_SOURCES_HOME/llvm/build"; print "chaning to $working_dir\n"; chdir $working_dir or die; @@ -261,7 +261,7 @@ () my $res = runit($cp_cmd); die "Can't exec $cp_cmd" if ($res != 0); - $ENV{"PATH"} = "$COV_BASE_PATH/bin:$ENV{'PATH'}"; + $ENV{"PATH"} = "$COV_BASE_HOME/bin:$ENV{'PATH'}"; my $opt = ""; $opt = "--enable-optimized" if (not ($enable_optimized eq "")); $res = runit("../configure $opt"); @@ -310,11 +310,11 @@ () go_build(); } -if (!(-d $COV_BASE_PATH)) { - mkdir $COV_BASE_PATH or die; +if (!(-d $COV_BASE_HOME)) { + mkdir $COV_BASE_HOME or die; } -if (!(-d "$COMPILER_SOURCES_PATH")) { - mkdir "$COMPILER_SOURCES_PATH" or die; +if (!(-d "$COMPILER_SOURCES_HOME")) { + mkdir "$COMPILER_SOURCES_HOME" or die; } main(); diff --git a/utah/scripts/coverage/gen_cov.pl b/utah/scripts/coverage/gen_cov.pl index 57e597ec7..e74f53bbc 100755 --- a/utah/scripts/coverage/gen_cov.pl +++ b/utah/scripts/coverage/gen_cov.pl @@ -5,59 +5,59 @@ use Digest::MD5 qw(md5); use File::stat; -my $COV_BASE_PATH = $ENV{"COV_BASE_PATH"}; +my $COV_BASE_HOME = $ENV{"COV_BASE_HOME"}; -#die "please set env $COV_BASE_PATH first!" -# if (!defined($COV_BASE_PATH)); +#die "please set env $COV_BASE_HOME first!" +# if (!defined($COV_BASE_HOME)); # for my convenience -if (!defined($COV_BASE_PATH)) { - $COV_BASE_PATH = "/uusoc/exports/scratch/chenyang/branch-test"; +if (!defined($COV_BASE_HOME)) { + $COV_BASE_HOME = "/uusoc/exports/scratch/chenyang/branch-test"; } -my $PATH = "$COV_BASE_PATH/bin"; -my $COMPILER_SOURCES_PATH = "$COV_BASE_PATH/sources"; +my $PATH = "$COV_BASE_HOME/bin"; +my $COMPILER_SOURCES_HOME = "$COV_BASE_HOME/sources"; # tmp setting on bethe where expect was installed locally # we don't need those if expect was installed via apt-get, etc -my $EXPECT_BASE_PATH = "$COV_BASE_PATH/expect/usr"; +my $EXPECT_BASE_HOME = "$COV_BASE_HOME/expect/usr"; -my $VOLATILE_PATH = "$COMPILER_SOURCES_PATH/volatile"; +my $VOLATILE_HOME = "$COMPILER_SOURCES_HOME/volatile"; -$PATH = "$EXPECT_BASE_PATH/bin:$VOLATILE_PATH:$PATH"; +$PATH = "$EXPECT_BASE_HOME/bin:$VOLATILE_HOME:$PATH"; $ENV{"PATH"} = "$PATH:$ENV{'PATH'}"; if (defined($ENV{'LD_LIBRARY_PATH'})) { - $ENV{"LD_LIBRARY_PATH"} = "$EXPECT_BASE_PATH/lib:$ENV{'LD_LIBRARY_PATH'}"; + $ENV{"LD_LIBRARY_PATH"} = "$EXPECT_BASE_HOME/lib:$ENV{'LD_LIBRARY_PATH'}"; } else { - $ENV{"LD_LIBRARY_PATH"} = "$EXPECT_BASE_PATH/lib"; + $ENV{"LD_LIBRARY_PATH"} = "$EXPECT_BASE_HOME/lib"; } -my $CSMITH_HOME = "$COMPILER_SOURCES_PATH/csmith"; +my $CSMITH_HOME = "$COMPILER_SOURCES_HOME/csmith"; my $CSMITH = "$CSMITH_HOME/src/csmith"; -my $LCOV_PATH = "$COMPILER_SOURCES_PATH/lcov-1.8/bin"; -my $LCOV = "$LCOV_PATH/lcov"; -my $LCOV_GEN_HTML = "$LCOV_PATH/genhtml"; -my $COV_DATA_PATH = "$COV_BASE_PATH/test_data"; +my $LCOV_HOME = "$COMPILER_SOURCES_HOME/lcov-1.8/bin"; +my $LCOV = "$LCOV_HOME/lcov"; +my $LCOV_GEN_HTML = "$LCOV_HOME/genhtml"; +my $COV_DATA_HOME = "$COV_BASE_HOME/test_data"; my %compilers = ( - "gcc" => "$COV_BASE_PATH/bin/current-gcc", - #"clang" => "$COV_BASE_PATH/bin/clang", - "llvm" => "$COV_BASE_PATH/bin/clang", + "gcc" => "$COV_BASE_HOME/bin/current-gcc", + #"clang" => "$COV_BASE_HOME/bin/clang", + "llvm" => "$COV_BASE_HOME/bin/clang", ); my %compiler_build_paths = ( - "gcc" => "$COMPILER_SOURCES_PATH/current-gcc/build", - "llvm" => "$COMPILER_SOURCES_PATH/llvm/build", - "clang" => "$COMPILER_SOURCES_PATH/llvm/build/tools/clang", - "llvm-testsuite" => "$COMPILER_SOURCES_PATH/llvm/build/projects/test-suite", + "gcc" => "$COMPILER_SOURCES_HOME/current-gcc/build", + "llvm" => "$COMPILER_SOURCES_HOME/llvm/build", + "clang" => "$COMPILER_SOURCES_HOME/llvm/build/tools/clang", + "llvm-testsuite" => "$COMPILER_SOURCES_HOME/llvm/build/projects/test-suite", ); my %base_cov_dirs = ( - "gcc" => "$COMPILER_SOURCES_PATH/current-gcc/build/gcc", + "gcc" => "$COMPILER_SOURCES_HOME/current-gcc/build/gcc", ); my %base_checks = ( @@ -97,9 +97,9 @@ my $MIN_PROGRAM_SIZE = 10000; -my $CSMITH_OUT = "$COV_DATA_PATH/csmith_out"; +my $CSMITH_OUT = "$COV_DATA_HOME/csmith_out"; -my $TEST_FAILS_OUT = "$COV_DATA_PATH/compilers_fail_out.txt"; +my $TEST_FAILS_OUT = "$COV_DATA_HOME/compilers_fail_out.txt"; my %prog_checksums = (); @@ -308,9 +308,9 @@ ($$$) sub gen_extended_cov() { foreach my $compiler (keys %compilers) { my $build_path = $compiler_build_paths{$compiler}; - my $extended_lcov_info = "$COV_DATA_PATH/$compiler" . "_extended.info"; - my $html_outdir = "$COV_DATA_PATH/${compiler}_html_ext"; - my $summary = "$COV_DATA_PATH/${compiler}_summary_ext.txt"; + my $extended_lcov_info = "$COV_DATA_HOME/$compiler" . "_extended.info"; + my $html_outdir = "$COV_DATA_HOME/${compiler}_html_ext"; + my $summary = "$COV_DATA_HOME/${compiler}_summary_ext.txt"; gen_lcov_info($compiler, $build_path, $extended_lcov_info); gen_lcov_html($summary, $html_outdir, $extended_lcov_info); @@ -320,9 +320,9 @@ () sub gen_base_cov() { foreach my $compiler (keys %compilers) { my $build_path = $compiler_build_paths{$compiler}; - my $base_lcov_info = "$COV_DATA_PATH/$compiler.info"; - my $html_outdir = "$COV_DATA_PATH/${compiler}_html"; - my $summary = "$COV_DATA_PATH/${compiler}_summary.txt"; + my $base_lcov_info = "$COV_DATA_HOME/$compiler.info"; + my $html_outdir = "$COV_DATA_HOME/${compiler}_html"; + my $summary = "$COV_DATA_HOME/${compiler}_summary.txt"; gen_base_cov_data($compiler); gen_lcov_info($compiler, $build_path, $base_lcov_info); @@ -330,8 +330,8 @@ () } } -if (!(-d $COV_DATA_PATH)) { - mkdir "$COV_DATA_PATH"; +if (!(-d $COV_DATA_HOME)) { + mkdir "$COV_DATA_HOME"; } gen_base_cov(); diff --git a/utah/scripts/coverage/parse_cov_results.pl b/utah/scripts/coverage/parse_cov_results.pl index 729a1076f..b0b027b8c 100755 --- a/utah/scripts/coverage/parse_cov_results.pl +++ b/utah/scripts/coverage/parse_cov_results.pl @@ -5,20 +5,20 @@ use strict; -my $COV_BASE_PATH = $ENV{"COV_BASE_PATH"}; +my $COV_BASE_HOME = $ENV{"COV_BASE_HOME"}; -#die "please set env $COV_BASE_PATH first!" -# if (!defined($COV_BASE_PATH)); +#die "please set env $COV_BASE_HOME first!" +# if (!defined($COV_BASE_HOME)); # for my convenience -if (!defined($COV_BASE_PATH)) { - $COV_BASE_PATH = "/uusoc/exports/scratch/chenyang/branch-test/test_data"; +if (!defined($COV_BASE_HOME)) { + $COV_BASE_HOME = "/uusoc/exports/scratch/chenyang/branch-test/test_data"; } -my $COV_DATA_PATH = "$COV_BASE_PATH"; -my $LN_OUT = "$COV_BASE_PATH/ln.out"; -my $FN_OUT = "$COV_BASE_PATH/fn.out"; -my $BR_OUT = "$COV_BASE_PATH/br.out"; +my $COV_DATA_HOME = "$COV_BASE_HOME"; +my $LN_OUT = "$COV_BASE_HOME/ln.out"; +my $FN_OUT = "$COV_BASE_HOME/fn.out"; +my $BR_OUT = "$COV_BASE_HOME/br.out"; my %base_overall_info = (); my %ext_overall_info = (); @@ -233,7 +233,7 @@ ($$$) ########################################################### -die "$COV_DATA_PATH doesn't exist!" if (!(-d $COV_DATA_PATH)); +die "$COV_DATA_HOME doesn't exist!" if (!(-d $COV_DATA_HOME)); if (@ARGV != 3) { help(); diff --git a/utah/scripts/john_driver/evaluate_program.pl b/utah/scripts/john_driver/evaluate_program.pl index ae4111fda..3d60d1fab 100755 --- a/utah/scripts/john_driver/evaluate_program.pl +++ b/utah/scripts/john_driver/evaluate_program.pl @@ -74,7 +74,7 @@ die "oops: CSMITH_HOME environment variable needs to be set" if (!defined($CSMITH_HOME)); -my $VOLATILE_PATH=$CSMITH_HOME."/utah/scripts/john_driver"; +my $VOLATILE_HOME=$CSMITH_HOME."/utah/scripts/john_driver"; my $LOCKFN = "/var/tmp/version_search_lockfile"; @@ -697,7 +697,7 @@ ($$$$$$$) } if (1) { - system "cat $compilerout >> ${VOLATILE_PATH}/compiler_output.txt"; + system "cat $compilerout >> ${VOLATILE_HOME}/compiler_output.txt"; } if ($VALGRIND_ON_COMPILER) { @@ -969,7 +969,7 @@ ($$$$$) system "touch ../../${NOTEFILE_PREFIX}checksum_$compiler.txt"; $interesting = 1; triage($compiler, - "$VOLATILE_PATH/test-${arch}-${base_compiler}-wrong-code-template.sh", + "$VOLATILE_HOME/test-${arch}-${base_compiler}-wrong-code-template.sh", $opt1, $opt, $root, $base_compiler, $arch); $consistent = 0; last; @@ -983,7 +983,7 @@ ($$$$$) print "INTERNAL VOLATILE FAILURE${write_problem} $compiler $opt WRAP=$wrap\n"; $interesting = 1; triage($compiler, - "$VOLATILE_PATH/test-${arch}-${base_compiler}-volatile-template.sh", + "$VOLATILE_HOME/test-${arch}-${base_compiler}-volatile-template.sh", $opt1, $opt, $root, $base_compiler, $arch); $consistent = 0; last; diff --git a/utah/scripts/john_driver/random_test.pl b/utah/scripts/john_driver/random_test.pl index 6e2b8e3cc..99eff89d6 100755 --- a/utah/scripts/john_driver/random_test.pl +++ b/utah/scripts/john_driver/random_test.pl @@ -57,9 +57,9 @@ if ($use_pintool) { # Before you could use pintool to test volatile accesses, change the pintool location when necessary! - my $PIN_PATH = $ENV{"PIN_PATH"}; - die "oops: PIN_PATH environment variable needs to be set" - if (!defined($PIN_PATH)); + my $PIN_HOME = $ENV{"PIN_HOME"}; + die "oops: PIN_HOME environment variable needs to be set" + if (!defined($PIN_HOME)); $XTRA .= " --enable-volatile-tests $platform --vol-addr-file $PINTOOL_VOL_ADDR "; my $pin_cmd; @@ -68,10 +68,10 @@ # i.e., obj-ia32/pinatrace.so for x86 and obj-intel64/pinatrace.so for x86_64. # For testing compcert, we use the ia32 version if (($platform eq "x86") || (not ($CSMITH_CCOMP eq ""))) { - $pin_cmd = "$PIN_PATH/ia32/bin/pinbin -t $PIN_PATH/source/tools/ManualExamples/obj-ia32/pinatrace.so -vol_input $PINTOOL_VOL_ADDR $PIN_MODE --"; + $pin_cmd = "$PIN_HOME/ia32/bin/pinbin -t $PIN_HOME/source/tools/ManualExamples/obj-ia32/pinatrace.so -vol_input $PINTOOL_VOL_ADDR $PIN_MODE --"; } elsif ($platform eq "x86_64") { - $pin_cmd = "$PIN_PATH/intel64/bin/pinbin -t $PIN_PATH/source/tools/ManualExamples/obj-intel64/pinatrace.so -vol_input $PINTOOL_VOL_ADDR $PIN_MODE --"; + $pin_cmd = "$PIN_HOME/intel64/bin/pinbin -t $PIN_HOME/source/tools/ManualExamples/obj-intel64/pinatrace.so -vol_input $PINTOOL_VOL_ADDR $PIN_MODE --"; } else { die "Invalid platform[$platform] for pintool!"; diff --git a/utah/scripts/john_driver/run_program.pl b/utah/scripts/john_driver/run_program.pl index 5608a894e..0a4bfad42 100755 --- a/utah/scripts/john_driver/run_program.pl +++ b/utah/scripts/john_driver/run_program.pl @@ -298,9 +298,9 @@ ($) ############################## main ########################### -my $VOLATILE_PATH=$ENV{"CSMITH_HOME"}."/utah/scripts/john_driver"; -die "oops: VOLATILE_PATH environment variable needs to be set" - if (!defined($VOLATILE_PATH)); +my $VOLATILE_HOME=$ENV{"CSMITH_HOME"}."/utah/scripts/john_driver"; +die "oops: VOLATILE_HOME environment variable needs to be set" + if (!defined($VOLATILE_HOME)); my $nargs = scalar(@ARGV); @@ -401,7 +401,7 @@ ($) } elsif ($arch eq "arm") { - my $arm_cmd = "rvdebug --batch --script=${VOLATILE_PATH}/rvd_script_1"; + my $arm_cmd = "rvdebug --batch --script=${VOLATILE_HOME}/rvd_script_1"; system "rm -f armul.trc"; system "cp -f $exe __image.axf"; # extra long time out-- this is just to cover up stupid bugs, the diff --git a/utah/scripts/one_off/reducer_driver.pl b/utah/scripts/one_off/reducer_driver.pl index a505f8bfa..81db25e42 100755 --- a/utah/scripts/one_off/reducer_driver.pl +++ b/utah/scripts/one_off/reducer_driver.pl @@ -7,11 +7,11 @@ die "please set CSMITH_HOME env first!" if (!defined($CSMITH_HOME)); -my $VOLATILE = $ENV{"VOLATILE_PATH"}; -die "please set VOLATILE_PATH env first!" +my $VOLATILE = $ENV{"VOLATILE_HOME"}; +die "please set VOLATILE_HOME env first!" if (!defined($VOLATILE)); -$ENV{"PATH"} = "$ENV{VOLATILE_PATH}:$ENV{PATH}"; +$ENV{"PATH"} = "$ENV{VOLATILE_HOME}:$ENV{PATH}"; my $host = hostname(); my $TEST_ROOT = "$CSMITH_HOME/reducer"; diff --git a/utah/scripts/one_off/test_framac.pl b/utah/scripts/one_off/test_framac.pl index d2f1844fe..3f306b266 100755 --- a/utah/scripts/one_off/test_framac.pl +++ b/utah/scripts/one_off/test_framac.pl @@ -62,8 +62,8 @@ my $CSMITH=$ENV{"CSMITH_HOME"}; die "please export environment variable CSMITH_HOME" if (!defined($CSMITH)); -my $FRAMAC=$ENV{"FRAMAC_PATH"}; -die "please export environment variable FRAMAC_PATH" if (!defined($FRAMAC)); +my $FRAMAC=$ENV{"FRAMAC_HOME"}; +die "please export environment variable FRAMAC_HOME" if (!defined($FRAMAC)); sub one_test($) { (my $seed) = @_; diff --git a/utah/scripts/reduce/simple_delta.pl b/utah/scripts/reduce/simple_delta.pl index 71c0e7083..d0bb20d56 100755 --- a/utah/scripts/reduce/simple_delta.pl +++ b/utah/scripts/reduce/simple_delta.pl @@ -19,10 +19,10 @@ my $CSMITH_HOME = $ENV{"CSMITH_HOME"}; die "please set CSMITH_HOME env first!" if (!defined($CSMITH_HOME)); -my $VOLATILE = $ENV{"VOLATILE_PATH"}; -die "please set VOLATILE_PATH env first!" if (!defined($VOLATILE)); +my $VOLATILE = $ENV{"VOLATILE_HOME"}; +die "please set VOLATILE_HOME env first!" if (!defined($VOLATILE)); -$ENV{"PATH"} = "$ENV{VOLATILE_PATH}:$ENV{PATH}"; +$ENV{"PATH"} = "$ENV{VOLATILE_HOME}:$ENV{PATH}"; my $COMPILER_TIMEOUT = 600; my $PROG_TIMEOUT = 2;