Skip to content

Commit 42ca4d0

Browse files
committed
do not use slash in test (windows compliant)
1 parent f01f9cb commit 42ca4d0

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

ci/run_tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ pushd custom_module_dir
350350
rm -rf ./test_custom_install
351351
"$fpm" install --prefix ./test_custom_install
352352
# Verify modules are installed in custom directory
353-
test -f ./test_custom_install/custom/modules/greeting.mod
354-
test -f ./test_custom_install/custom/modules/math_utils.mod
353+
test -f ./test_custom_install/custom_modules/greeting.mod
354+
test -f ./test_custom_install/custom_modules/math_utils.mod
355355
# Verify library is still installed normally
356356
test -f ./test_custom_install/lib/libcustom-module-dir.a
357357
# Clean up

example_packages/custom_module_dir/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This example demonstrates the use of a custom module directory in the `[install]
55
## Features
66

77
- Two simple Fortran modules: `greeting` and `math_utils`
8-
- Custom module installation directory specified as `custom/modules`
8+
- Custom module installation directory specified as `custom_modules`
99
- Shows how modules can be installed to a different location than headers
1010

1111
## Configuration
@@ -15,10 +15,10 @@ In `fpm.toml`:
1515
```toml
1616
[install]
1717
library = true
18-
module-dir = "custom/modules"
18+
module-dir = "custom_modules"
1919
```
2020

21-
This configuration will install compiled `.mod` files to the `custom/modules` directory instead of the default `include` directory.
21+
This configuration will install compiled `.mod` files to the `custom_modules` directory instead of the default `include` directory.
2222

2323
## Testing
2424

@@ -28,5 +28,5 @@ To test this example:
2828
cd example_packages/custom_module_dir
2929
fpm build
3030
fpm install --prefix /tmp/test_install
31-
# Check that .mod files are in /tmp/test_install/custom/modules/
31+
# Check that .mod files are in /tmp/test_install/custom_modules/
3232
```
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name = "custom-module-dir"
22
install.library = true
3-
install.module-dir = "custom/modules"
3+
install.module-dir = "custom_modules"

test/fpm_test/test_installer.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,10 @@ subroutine test_install_module_custom(error)
192192
type(mock_installer_t) :: mock
193193
type(installer_t) :: installer
194194

195-
call new_installer(installer, prefix="PREFIX", moduledir="custom/modules", verbosity=0, copy="mock")
195+
call new_installer(installer, prefix="PREFIX", moduledir="custom_modules", verbosity=0, copy="mock")
196196
mock%installer_t = installer
197-
mock%expected_dir = join_path("PREFIX", "custom/modules")
198-
mock%expected_run = 'mock "test_module.mod" "'//join_path("PREFIX", "custom/modules")//'"'
197+
mock%expected_dir = join_path("PREFIX", "custom_modules")
198+
mock%expected_run = 'mock "test_module.mod" "'//join_path("PREFIX", "custom_modules")//'"'
199199

200200
call mock%install_module("test_module.mod", error)
201201

0 commit comments

Comments
 (0)