ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make getenv style variable test fully portable

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-10-03 09:37:05 -04:00
parent ea512ce2bb
commit 658df50e97
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unittest/fortran/test_fortran_extract_variable.f90
View File

@ -118,8 +118,7 @@ SUBROUTINE f_lammps_setup_extract_variable () BIND(C)
CALL lmp%command('variable ex equal exp(v_lp)') CALL lmp%command('variable ex equal exp(v_lp)')
CALL lmp%command('variable fmt format ex %.6G') CALL lmp%command('variable fmt format ex %.6G')
CALL lmp%command('variable fmt_pad format ex %08.6g') CALL lmp%command('variable fmt_pad format ex %08.6g')
! USERNAME should exist on all platforms (incl. Windows) CALL lmp%command('variable username getenv FORTRAN_USER')
CALL lmp%command('variable username getenv USERNAME')
CALL lmp%command('variable greeting file ' // absolute_path('greetings.txt')) CALL lmp%command('variable greeting file ' // absolute_path('greetings.txt'))
CALL lmp%command('variable atfile atomfile ' & CALL lmp%command('variable atfile atomfile ' &
// absolute_path('atomdata.txt')) // absolute_path('atomdata.txt'))

5
unittest/fortran/wrap_extract_variable.cpp
View File

@ -3,6 +3,8 @@
#include "lammps.h" #include "lammps.h"
#include "library.h" #include "library.h"
#include "platform.h"
#include <mpi.h> #include <mpi.h>
#include <string> #include <string>
#include <cstdio> #include <cstdio>
@ -175,8 +177,9 @@ TEST_F(LAMMPS_extract_variable, format_pad)
TEST_F(LAMMPS_extract_variable, getenv) TEST_F(LAMMPS_extract_variable, getenv)
{ {
LAMMPS_NS::platform::putenv("FORTRAN_USER=myuser");
f_lammps_setup_extract_variable(); f_lammps_setup_extract_variable();
char *env = std::getenv("USERNAME"); char *env = std::getenv("FORTRAN_USER");
char *fenv = f_lammps_extract_variable_getenv(); char *fenv = f_lammps_extract_variable_getenv();
EXPECT_STREQ(fenv, env); EXPECT_STREQ(fenv, env);
std::free(fenv); std::free(fenv);