Skip to content

Commit

Permalink
Don't patch libcrypt when running the tests.
Browse files Browse the repository at this point in the history
It is not a real game disk image.

Signed-off-by: Ronnie Sahlberg <[email protected]>
  • Loading branch information
sahlberg committed Nov 9, 2024
1 parent e490b61 commit e6e0dd3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/py.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@ jobs:
./pop-fe.py --install
- name: Test building a PS3 package
run: |
./pop-fe.py --ps3-pkg=vs.pkg --snd0=testimages/vs/sine.wav --cover=testimages/vs/blank.png --pic0=testimages/vs/blank.png --pic1=testimages/vs/blank.png --force-no-assets testimages/vs/vs.cue
./pop-fe.py --ps3-pkg=vs.pkg --snd0=testimages/vs/sine.wav --cover=testimages/vs/blank.png --pic0=testimages/vs/blank.png --pic1=testimages/vs/blank.png --force-no-assets --no-libcrypt testimages/vs/vs.cue
- name: Test building a PS3 package with UPPER CASE .CUE
run: |
./pop-fe.py --ps3-pkg=vs.pkg --snd0=testimages/vs/sine.wav --cover=testimages/vs/blank.png --pic0=testimages/vs/blank.png --pic1=testimages/vs/blank.png --force-no-assets testimages/vs/vs.CUE
./pop-fe.py --ps3-pkg=vs.pkg --snd0=testimages/vs/sine.wav --cover=testimages/vs/blank.png --pic0=testimages/vs/blank.png --pic1=testimages/vs/blank.png --force-no-assets --no-libcrypt testimages/vs/vs.CUE
- name: Test building a multidisc PS3 package
run: |
./pop-fe.py --ps3-pkg=vs.pkg --snd0=testimages/vs/sine.wav --cover=testimages/vs/blank.png --pic0=testimages/vs/blank.png --pic1=testimages/vs/blank.png --force-no-assets testimages/vs/vs.cue testimages/vs/vs.cue
./pop-fe.py --ps3-pkg=vs.pkg --snd0=testimages/vs/sine.wav --cover=testimages/vs/blank.png --pic0=testimages/vs/blank.png --pic1=testimages/vs/blank.png --force-no-assets --no-libcrypt testimages/vs/vs.cue testimages/vs/vs.cue
- name: Test building a multidisc PSP EBOOT
run: |
mkdir -p PSP/GAME
./pop-fe.py --psp-dir=. --snd0=testimages/vs/sine.wav --cover=testimages/vs/blank.png --pic0=testimages/vs/blank.png --pic1=testimages/vs/blank.png --force-no-assets testimages/vs/vs.cue testimages/vs/vs.cue
./pop-fe.py --psp-dir=. --snd0=testimages/vs/sine.wav --cover=testimages/vs/blank.png --pic0=testimages/vs/blank.png --pic1=testimages/vs/blank.png --force-no-assets --no-libcrypt testimages/vs/vs.cue testimages/vs/vs.cue
- name: Test building a multidisc PSP EBOOT overriding the GAME_ID
run: |
mkdir -p PSP/GAME
./pop-fe.py --psp-dir=. --game_id=SLPS01623 --snd0=testimages/vs/sine.wav --cover=testimages/vs/blank.png --pic0=testimages/vs/blank.png --pic1=testimages/vs/blank.png --force-no-assets testimages/vs/vs.cue testimages/vs/vs.cue
./pop-fe.py --psp-dir=. --game_id=SLPS01623 --snd0=testimages/vs/sine.wav --cover=testimages/vs/blank.png --pic0=testimages/vs/blank.png --pic1=testimages/vs/blank.png --force-no-assets --no-libcrypt testimages/vs/vs.cue testimages/vs/vs.cue
stat ./PSP/GAME/SLPS01623/EBOOT.PBP
build-windows:
Expand Down
5 changes: 4 additions & 1 deletion pop-fe.py
Original file line number Diff line number Diff line change
Expand Up @@ -4186,6 +4186,8 @@ def patch_libcrypt(real_disc_ids, cue_files, img_files, subdir='pop-fe-work/'):
help='Name of the PS3 pckage to create')
parser.add_argument('--psc-dir',
help='Where the PS Classic/AutoBleem memory card is mounted')
parser.add_argument('--no-libcrypt', action='store_true',
help='Do not patch libcrypt')
parser.add_argument('--fetch-metadata', action='store_true',
help='Just fetch metadata for the game')
parser.add_argument('--game_id',
Expand Down Expand Up @@ -4504,7 +4506,8 @@ def patch_libcrypt(real_disc_ids, cue_files, img_files, subdir='pop-fe-work/'):
magic_word.append(libcrypt[real_disc_ids[idx]]['magic_word'])
subchannels.append(generate_subchannels(libcrypt[real_disc_ids[idx]]['magic_word']))

cue_files, img_files = patch_libcrypt(real_disc_ids, cue_files, img_files, subdir=subdir)
if not args.no_libcrypt:
cue_files, img_files = patch_libcrypt(real_disc_ids, cue_files, img_files, subdir=subdir)

print('Cue Files', cue_files) if verbose else None
print('Img Files', img_files) if verbose else None
Expand Down

0 comments on commit e6e0dd3

Please sign in to comment.