Unverified Commit d7a9bf23 authored by Eisenhauer, Greg's avatar Eisenhauer, Greg Committed by GitHub
Browse files

Merge pull request #1070 from eisenhauer/TestingTweaks 

Stop sending reader output to /dev/null.  Ignore time gap in reader u…
parents f9895a7c e8ea2fa7

testing/adios2/engine/sst/TestSstRead.cpp

+19 −7
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ public: 


adios2::Params engineParams = {}; // parsed from command line

int TimeGapExpected = 0;

int IgnoreTimeGap = 1;

std::string fname = "ADIOS2Sst";



static std::string Trim(std::string &str)
@@ -253,16 +254,20 @@ TEST_F(SstReadTest, ADIOS2SstRead1D8) 
        TimeGapDetected++;

    }



    if (!IgnoreTimeGap)

    {

        if (TimeGapExpected)

        {

            EXPECT_TRUE(TimeGapDetected);

        }

        else

        {

        EXPECT_EQ(t, NSteps);



            EXPECT_FALSE(TimeGapDetected);

        }

    }



    EXPECT_EQ(t, NSteps);



    // Close the file

    engine.Close();

}
@@ -284,7 +289,14 @@ int main(int argc, char **argv) 
    {

        if (std::string(argv[1]) == "--expect_time_gap")

        {



            TimeGapExpected++;

            IgnoreTimeGap = 0;

        }

        else if (std::string(argv[1]) == "--expect_contiguous_time")

        {

            TimeGapExpected = 0;

            IgnoreTimeGap = 0;

        }

        else if (std::string(argv[1]) == "--compress_sz")

        {

testing/adios2/engine/sst/run_staging_test.in

+2 −2
Original line number Diff line number Diff line
@@ -101,9 +101,9 @@ if [ "$reader_delay" -ne 0 ]; then 
    sleep $reader_delay

fi

if [ $vflag == "yes" ]; then

    echo "Doing ($read_spawn_smd ./$reader_prog $args 2>&1 1>/dev/null) & reader_pid=$!"

    echo "Doing ($read_spawn_smd ./$reader_prog $args ) & reader_pid=$!"

fi

($read_spawn_cmd ./$reader_prog $args 2>&1 1>/dev/null) & reader_pid=$!

($read_spawn_cmd ./$reader_prog $args) & reader_pid=$!