Commit 43c784c5 authored by Mccaskey, Alex's avatar Mccaskey, Alex
Browse files

fixing bug where qcor isn't installed for tests at first 



Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent 70791ab0

runtime/tests/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line
@@ -2,9 +2,11 @@ set(CMAKE_CXX_COMPILER ${CMAKE_BINARY_DIR}/qcor) 
set(ORIGINAL_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

link_directories(${XACC_ROOT}/lib)



set(CMAKE_CXX_FLAGS "${ORIGINAL_CXX_FLAGS} -a local-ibm")

set(CMAKE_CXX_FLAGS "--qcor-driver-path ${CMAKE_BINARY_DIR}/compiler ${ORIGINAL_CXX_FLAGS} -a local-ibm")



add_executable(test_simple_kernel test_simple_kernel.cpp)

target_include_directories(test_simple_kernel PRIVATE ${XACC_INCLUDE_ROOT}/gtest)

add_test(test_simple_kernel test_simple_kernel)

target_link_libraries(test_simple_kernel PRIVATE gtest gtest_main)



add_dependencies(test_simple_kernel qcor-driver)

scripts/qcor.in

+9 −1
Original line number Diff line number Diff line
@@ -23,6 +23,14 @@ def main(argv=None): 
        verbose=True

        sys.argv.remove('--qcor-verbose')



    qcordriver = 'qcor-driver'

    if '--qcor-driver-path' in sys.argv[1:]:

        pidx = sys.argv.index('--qcor-driver-path')

        p = sys.argv[pidx+1]

        qcordriver = p + '/' + qcordriver

        sys.argv.remove('--qcor-driver-path')

        sys.argv.remove(p)



    hasAcc = False

    accName = ''

    if '--accelerator' in sys.argv[1:]:
@@ -50,7 +58,7 @@ def main(argv=None): 
        tmpFileName = os.path.basename(filename)

        idx = tmpFileName.find('.')

        expectedFile = '.'+tmpFileName[:idx]+'_out'+tmpFileName[idx:]

        sys.argv[0] = 'qcor-driver'

        sys.argv[0] = qcordriver

        if hasAcc:

            commands = [sys.argv[0]] + baseIncludes + ['--accelerator',accName] + sys.argv[1:]

        else: