Commit ee2a0ad1 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

unit test fixes for UserInterface and ProcessExportPds3

parent 46385117

isis/cmake/FindAllDependencies.cmake

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
message("CONDA PREFIX: $ENV{CONDA_PREFIX}")

list(APPEND CMAKE_FIND_ROOT_PATH $ENV{CONDA_PREFIX} $ENV{CONDA_PREFIX}/lib/cmake/Qt5)



# Add search USGS maintained libraries

list(APPEND CMAKE_INCLUDE_PATH

  /usgs/pkgs/local/v007/include/

  /usgs/pkgs/local/v007/bin/
@@ -42,7 +43,6 @@ set(CMAKE_PREFIX_PATH 
  /usr/local/lib/

)





# Add thirdPartyCppFlags

set(thirdPartyCppFlags ${thirdPartyCppFlags} -DGMM_USES_SUPERLU)

set(thirdPartyCppFlags ${thirdPartyCppFlags} "-DENABLEJP2K=${JP2KFLAG}")

isis/src/base/objs/ProcessExportPds4/unitTest.cpp

+10 −10
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ void IsisMain() { 
    defaultLabel.remove(QRegExp(" xsi.*=\".*\""));

    std::cout << defaultLabel;



    std::cout << std::endl << "Testing defaulte CaSSIS export" << std::endl;

    std::cout << std::endl << "Testing default CaSSIS export" << std::endl;



    Isis::ProcessExportPds4 p;

isis/src/base/objs/UserInterface/unitTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ int main(int argc, char *argv[]) { 


  cout << "Unit test for Isis::UserInterface ..." << endl;



  QString unitTestXml = Isis::FileName(QString(ISISBUILDDIR) + "/unitTest/isis3_unit_test_UserInterface.xml").expanded();

  QString unitTestXml = Isis::FileName(QString(ISISROOT) + "/src/base/objs/UserInterface/unitTest.xml").expanded();

  QString highpass = Isis::FileName(QString(ISISBUILDDIR) + "/bin/xml/highpass.xml").expanded();



  char *myArgv[15];// = {"unitTest", "from=input.cub", "to=output.cub"};