vchoi_fork

[svn-r18329] Description:
    Fix to handle $srcdir for nightly test as well as local testing

Tested:
    jam, amani and linew